Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

2022-04-08 15:40:32 +08:00
parent 229b6d68b8 cda4ce1765
commit 3ed900f1be
6 changed files with 53 additions and 27 deletions
--- a/proxy.conf.js
+++ b/proxy.conf.js
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-18 09:51:21
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-08 11:16:53
+ * @LastEditTime : 2022-04-08 14:26:28
 * @FilePath     : \\tms-obc-web\\proxy.conf.js
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -20,7 +20,7 @@ module.exports = {
  // }
  '//api': {
    target: {
-      host: 'tms-api-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
      protocol: 'https:',
      port: 443
    },
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-30 14:00:43
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 20:31:33
+ * @LastEditTime : 2022-04-08 15:27:15
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\order-reporting.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -39,10 +39,20 @@
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
    [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading">
-    <ng-template st-row="putStatusLabel" let-item let-index="index">
+    <ng-template st-row="putStatus" let-item let-index="index">
      <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
-      <span *ngIf="item?.putStatus !== '2'">{{item?.billStatusLabel}}</span>
-      <span  *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">异常</span>
+      <span *ngIf="item?.putStatus == '0'">待上传</span>
+      <span *ngIf="item?.putStatus == '1'">已上传</span>
+      <span *ngIf="item?.putStatus == '3'">上传中</span>
+      <span  *ngIf="item?.putStatus == '2'" style="color: red;" (click)="unnormal(item)">上传异常</span>
+
+    </ng-template>
+    <ng-template st-row="checkStatus" let-item let-index="index">
+      <!-- <a (click)="viewAuditResult(item)" *ngIf="item?.billStatus === '2'">{{item?.billStatusLabel}}</a> -->
+      <span *ngIf="item?.checkStatus == '0'" (click)="viewResult(item)">校验中</span>
+      <span *ngIf="item?.checkStatus == '1'">通过</span>
+      <!-- <span  *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="unnormal(item)">不通过</span> -->
+      <span  *ngIf="item?.checkStatus == '2'" style="color: red;" (click)="viewResult(item)">不通过</span>

    </ng-template>
    <ng-template st-row="driverName" let-item let-index="index">
--- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
@ -27,10 +27,10 @@ export class TaxManagementOrderReportingComponent implements OnInit {
  tabType!: string;
  isLoading: boolean = false;
  tabs: any[] = [
-    { name: '待上传', value: '1' },
-    { name: '上传中', value: '2' },
-    { name: '已上传', value: '3' },
-    { name: '异常', value: '4' },
+    { name: '待上传', value: '0' },
+    { name: '上传中', value: '3' },
+    { name: '已上传', value: '1' },
+    { name: '异常', value: '2' },
    { name: '全部', value: '' }
  ];
  selectedIndex = ''; //选择的项目
@ -57,7 +57,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
   */
  get reqParams() {
    const params = Object.assign({}, this.sf?.value || {}, {
-      representationsStatus: this.selectedIndex,
+      putStatus: this.selectedIndex,
    });
    delete params._$expand;
    return { ...params };
@ -176,7 +176,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
            },
          }
        },
-        serviceType1: {
+        checkStatus: {
          title: '精准',
          type: 'string',
          ui: {
@ -240,8 +240,8 @@ export class TaxManagementOrderReportingComponent implements OnInit {
  initST() {
    this.columns = [
      { title: '', type: 'checkbox', className: 'text-center', width: '60px', },
-      { title: '上传状态', index: 'putStatus', className: 'text-center', width: '120px', },
-      { title: '精准', index: 'platformCheckStatusLabel', className: 'text-center', width: '120px', },
+      { title: '上传状态', render: 'putStatus', className: 'text-center', width: '120px', },
+      { title: '精准', render: 'checkStatus', className: 'text-center', width: '120px', },
      {
        title: '订单号',
        index: 'billCode',
@ -251,7 +251,7 @@ export class TaxManagementOrderReportingComponent implements OnInit {
      { title: '运单号', index: 'wayBillCode', className: 'text-center', width: '150px', },
      {
        title: '网络货运人',
-        render: 'serviceType',
+        render: 'shipperName',
        className: 'text-center',
        width: '180px',
      },
@ -370,7 +370,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
  }

  selectChange(item: any) {
-    this.selectedIndex = item?.representationsStatus || '';
+    console.log(item);
+    
+    this.selectedIndex = item?.value || '';
    setTimeout(() => {
      this.st.load();
    })
@ -461,6 +463,9 @@ export class TaxManagementOrderReportingComponent implements OnInit {
      nzFooter: null
    });
    modalRef.afterClose.subscribe(res => {
+      if (res) {
+        this.st.load();
+      }
    })
  }

--- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html
+++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-31 11:10:10
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 20:07:47
+ * @LastEditTime : 2022-04-08 15:28:46
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -15,7 +15,7 @@
    </nz-tabset>
  </div>
  <div style="width: 90%;">
-    <st #st [scroll]="{x:'1000px'}" [data]="service.$api_listOperationalReportPage" [columns]="columns"
+    <st #st [scroll]="{x:'1000px'}" [data]="service.$api_get_getTaxFieldCheckList" [columns]="columns"
      [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
      [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: false}" [loading]="false"
      [bordered]="true">
--- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts
+++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-03-30 14:26:01
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-30 14:28:54
+ * @LastEditTime : 2022-04-08 15:36:04
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\components\\order-reporting\\verify-result\\verify-result.component.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -33,21 +33,27 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
  @ViewChild('st') private readonly st!: STComponent;
  columns: STColumn[] = [];
  record: any = {}
+  subjectType: string = '0';
  tabs: any[] = [
-    { name: '平台信息', value: '1' },
-    { name: '货主信息', value: '2' },
-    { name: '司机信息', value: '3' },
-    { name: '订单信息', value: '4' },
+    { name: '平台信息', value: '0' },
+    { name: '货主信息', value: '1' },
+    { name: '司机信息', value: '2' },
+    { name: '订单信息', value: '3' },
  ];

  get reqParams() {
-    return {};
+    const params ={
+      subjectId: this.record?.shipperId,
+      subjectType: this.subjectType || '0'
+    }
+    return params;
  }
  constructor(public service: TaxManagementService, private modalRef: NzModalRef, public router: Router) {
-
  }

  ngOnInit(): void {
+    console.log(this.record);
+    
    this.initST();
  }

@ -73,7 +79,10 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit {
  }

  selectTab(e: any) {
-
+    setTimeout(() => {
+      this.subjectType = e?.value;
+      this.st.load(1);
+    })
  }

  update() {
--- a/src/app/routes/tax-management/services/tax-management.service.ts
+++ b/src/app/routes/tax-management/services/tax-management.service.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-27 10:30:56
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-04-07 20:41:55
+ * @LastEditTime : 2022-04-08 15:28:39
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\tax-management\\services\\tax-management.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -43,6 +43,8 @@ export class TaxManagementService extends ShipperBaseService {
  $api_get_recessionTaxOrder = `/api/sdc/tax/recessionTaxOrder`;
  // 上传税务订单
  $api_get_uploadingTaxOrder = `/api/sdc/tax/uploadingTaxOrder`;
+  // 上传税务订单
+  $api_get_getTaxFieldCheckList = `/api/sdc/taxFieldCheck/getTaxFieldCheckList`;
  $api_recall_reporting = ``; // 撤回
  $api_async_export_order_reporting_list = ``; // 导出订单上报
  $api_get_upload_setting = ``; // 修改上传设置