车辆对接

2021-12-30 14:26:28 +08:00
parent 9b27cfe76b
commit 64096c02a1
14 changed files with 153 additions and 62 deletions
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html
@ -1,3 +1,11 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-27 14:08:49
+ * @LastEditTime: 2021-12-30 14:15:22
+ * @LastEditors: Please set LastEditors
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\ticket-management\components\cancellation-invoice\cancellation-invoice.component.html
+-->
 <page-header-wrapper [title]="'销票处理'">
 </page-header-wrapper>

@ -42,13 +50,16 @@
    </ng-template>


-    <st #st [data]="service.$mock_url" [columns]="columns"
+    <st #st [data]="service.$api_ficoVatinvHList" [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] }"
        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
-        <ng-template st-row="no" let-item let-index="index" let-column="column">
-            {{ item.no }} <br> <label class="text-primary">待受理</label>
+        <ng-template st-row="vatinvcode" let-item let-index="index" let-column="column">
+            {{ item.vatinvcode }} <br> 
+            <label class="text-primary" *ngIf="item.sts == '1'">待处理</label>
+            <label class="text-primary" *ngIf="item.sts == '2'">待确认</label>
+            <label class="text-primary" *ngIf="item.sts == '3'">已确认</label>
        </ng-template>
        <ng-template st-row="description" let-item let-index="index" let-column="column">
            起运地: 广东省深圳市南山区 <br>
--- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
+++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
@ -186,16 +186,16 @@ export class CancellationInvoiceComponent implements OnInit {
            }
          }
        },
-        or2derSn: {
-          type: 'string',
-          title: '订单号',
-          ui: {
-            placeholder: '请输入',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
-        },
+        // or2derSn: {
+        //   type: 'string',
+        //   title: '订单号',
+        //   ui: {
+        //     placeholder: '请输入',
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     }
+        //   }
+        // },
        createTime: {
          title: '申请时间',
          type: 'string',
@ -215,20 +215,20 @@ export class CancellationInvoiceComponent implements OnInit {
  private initST(): STColumn[] {
    return [
      { title: '', index: 'key', type: 'checkbox' },
-      { title: '分票编号', render: 'no', width: 150 },
+      { title: '分票编号', render: 'vatinvcode', width: 150 },
      { title: '申请编号', index: 'callNo', width: 120 },
-      { title: '申请时间', index: 'updatedAt', type: 'date', width: 150 },
-      { title: '网络货运人', index: 'callNo', width: 120 },
-      { title: '购买方', index: 'callNo', width: 90 },
-      { title: '订单数', index: 'callNo', width: 90 },
-      { title: '价税合计', index: 'callNo', width: 90 },
-      { title: '金额', index: 'callNo', width: 100 },
-      { title: '税率', index: 'callNo', width: 90 },
-      { title: '税额', index: 'callNo', width: 90 },
-      { title: '服务名称', index: 'callNo', width: 100 },
-      { title: '销货清单', index: 'callNo', width: 90 },
-      { title: '票面备注', render: 'description', width: 250 },
-      { title: '其他要求', index: 'callNo', width: 100 },
+      { title: '申请时间', index: 'createTime', type: 'date', width: 150 },
+      { title: '网络货运人', index: 'ltdName', width: 120 },
+      { title: '购买人', index: 'artoName', width: 90 },
+      { title: '订单数', index: 'ordlines', width: 90 },
+      { title: '价税合计', index: 'disvatmoney', width: 90 },
+      { title: '金额', index: 'vatnotax', width: 100 },
+      { title: '税率', index: 'billvatrate', width: 90 },
+      { title: '税额', index: 'disvattax', width: 90 },
+      { title: '服务名称', index: 'vatname', width: 100 },
+      { title: '销货清单', index: 'isdetail', width: 90 },
+      { title: '票面备注', render: 'vatremarks', width: 250 },
+      { title: '其他要求', index: 'otherremarks', width: 100 },
      {
        title: '操作',
        width: 150,
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
@ -26,7 +26,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
  totalCallNo = 0;
  _$expand = false;

-  vatappHId = null;
+  id = null;
  headerInfo: any = {};
  constructor(
    public service: TicketService,
@ -34,7 +34,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
    private route: ActivatedRoute,
    private router: Router
  ) {
-    this.vatappHId = route.snapshot.params.id;
+    this.id = route.snapshot.params.id;
    this.loadHeadInfo();
  }

@ -43,7 +43,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
  }

  loadHeadInfo() {
-    this.service.request(this.service.$api_get_invoice_requested_header_detail, { vatappHId: this.vatappHId }).subscribe(res => {
+    this.service.request(this.service.$api_get_invoice_requested_header_detail, { id: this.id }).subscribe(res => {
      console.log(res);
      if (res) {
        this.headerInfo = res;
--- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
+++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
@ -359,7 +359,7 @@ export class InvoiceRequestedComponent implements OnInit {
    console.log(item)
    this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id,
    {
-      queryParams: { vatappHId : item?.id }
+      queryParams: { id : item?.id }
    }
  ])
  }
--- a/src/app/routes/ticket-management/services/ticket.service.ts
+++ b/src/app/routes/ticket-management/services/ticket.service.ts
@ -1,8 +1,8 @@
 /*
 * @Author: your name
 * @Date: 2021-12-29 13:12:35
- * @LastEditTime: 2021-12-29 15:44:27
- * @LastEditors: your name
+ * @LastEditTime: 2021-12-30 13:57:19
+ * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\ticket-management\services\ticket.service.ts
 */
@ -23,6 +23,8 @@ export class TicketService extends ShipperBaseService {
  $api_get_invoice_requested_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatapp';
  // 删除开票申请订单明细
  $api_remove_bill = '/api/fcc/ficoVatappBill/deletebatch';
+  // 删除开票申请订单明细
+  $api_ficoVatinvHList = '/api/fcc/ficoVatinvH/ficoVatinvHList';

  constructor(public injector: Injector) {
    super(injector);