车辆接口更新

2022-01-24 15:59:51 +08:00
parent 17b457cd0d
commit 9ae9f9894d
19 changed files with 1853 additions and 73 deletions
--- a/src/app/routes/order-management/components/bulk/bulk.component.ts
+++ b/src/app/routes/order-management/components/bulk/bulk.component.ts
@ -665,6 +665,10 @@ export class OrderManagementBulkComponent implements OnInit {
    });
  }
  userAction() {
+    if(this.selectedRows.length <= 0) {
+      this.service.msgSrv.error('请选择订单！')
+      return
+    }
    let params: any[] = [];
    this.selectedRows.forEach(item => {
      params.push(item.id);
--- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
+++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-24 10:55:27
+ * @LastEditTime : 2022-01-24 14:33:59
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -78,6 +78,9 @@
      </ng-template>
    <ng-template st-row="billCode" let-item let-index="index">
      <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
+      <div>
+        <span>{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
+      </div>
      <div>
        <span>{{item?.billStatusLabel}}</span>
      </div>
--- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
+++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
@ -59,8 +59,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
   */
  get reqParams() {
    const a: any = {};
-    if (this.resourceStatus) {
-      a.billStatus = this.resourceStatus;
+    if (this.resourceStatus >= 0) {
+      a.complianceStatus = this.resourceStatus;
    }
    const params: any = Object.assign({}, this.sf?.value || {});
    delete params._$expand;
@ -98,8 +98,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
      unstayQuantity: 0
    };
    const params: any = Object.assign({}, this.reqParams || {});
-    delete params.billStatus
-    this.service.request(this.service.$api_get_getComplianceStatisticalStatus, { ...this.reqParams }).subscribe(res => {
+    delete params.complianceStatus
+    this.service.request(this.service.$api_get_getComplianceStatisticalStatus, params).subscribe(res => {
      if (res) {
        let totalCount = 0;
        res.forEach((element: any) => {
@ -117,7 +117,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
    });
  }
  selectChange(e: number) {
-    this.resourceStatus = e;
+    this.resourceStatus = e - 1;
    this.initST();
    setTimeout(() => {
      this.st.load();
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2022-01-12 10:52:50
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-24 11:06:06
+ * @LastEditTime : 2022-01-24 15:40:10
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@ -87,6 +87,9 @@
      </ng-template>
    <ng-template st-row="billCode" let-item let-index="index">
      <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
+      <div>
+        <span>{{item?.serviceTypeName}}</span>
+      </div>
      <div>
        <span>{{item?.billStatusLabel}}</span>
      </div>
@ -107,45 +110,17 @@
        </p>
      </div>
    </ng-template>
-      <!-- <ng-template st-row="externalSn" let-item let-index="index">
-        <span class="mr-xs">{{111111}}</span>
-        <a (click)="editEnternalSn(item)">编辑</a>
-      </ng-template> -->
-      <ng-template st-row="enStatusStr27878" let-item let-index="index">
-        <div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
-      </ng-template>
-      <ng-template #contentTemplate>
-        <div>
-          <p>预付：¥200.00</p>
-          <p>到付：¥200.00</p>
-          <p>油卡：¥200.00</p>
-          <p>回单付：¥200.00</p>
-          <p>小计：¥200.00</p>
-          <p>附加费：¥200.00</p>
-        </div>
-      </ng-template>
    </st>
  </div>
 </nz-card>

-
-
-
-<ng-template #enable>
-  <div class="ant-popover-message">
-    <i nz-icon nzType="info-circle" nzTheme="fill"></i>
-    <div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">已选择{{selectedRows?.length || 0}}条订单，确认批量签收吗？
-    </div>
-    <div class="ant-popover-message-title ng-star-inserted">
-      签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。
-    </div>
-  </div>
-</ng-template>
 <ng-template #extraTemplate>
  <div>
-    <!-- <button  nz-button nzType="primary" nzGhost nz-popconfirm
-[nzPopconfirmTitle]="enable" (nzOnConfirm)="userAction()" nzPopconfirmPlacement="bottomRight">
+    <button  nz-button nzType="primary" (click)="sign('1')">
 批量签收
-</button>  -->
+</button> 
+    <button  nz-button nzType="primary" (click)="sign1('1')">
+      批量生成电子单据
+</button> 
  </div>
 </ng-template>
--- a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
+++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
@ -77,7 +77,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
    };
    const params: any = Object.assign({}, this.reqParams || {});
    delete params.billStatus
-    this.service.request(this.service.$api_get_getAuditStatistical, { ...this.reqParams }).subscribe(res => {
+    this.service.request(this.service.$api_get_getAuditStatistical, params).subscribe(res => {
      if (res) {
        let totalCount = 0;
        res.forEach((element: any) => {
@ -334,7 +334,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
        buttons: [
          {
            text: '通过',
-            click: _record => console.log('1'),
+            click: _record => this.sign(_record),
            // iif: item => item.billStatus == '5'
          },
          {
@ -420,14 +420,30 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
      this.getGoodsSourceStatistical()
  });
  }
-  // 取消订单
-  cancellation(item: any) {
-    // api_get_cancelAnOrder
+  // 通过
+  sign(item?: any) {
+    let params: any = []
+    let text = '';
+    if(item === '1') {
+      if(this.selectedRows.length <= 0) {
+        this.service.msgSrv.error('请选择订单！')
+        return
+      }
+      this.selectedRows.forEach(ite => {
+        params.push(ite.id);
+      });
+      text =  `<b>已选择${this.selectedRows.length}条订单，确认批量通过审核吗？</b>`
+    } else {
+      text =  `<b>确认通过审核吗？</b>`
+      params.push(item.id);
+    }
+    console.log(this.selectedRows)
+    console.log(params)
    this.modal.confirm({
-      nzTitle: '<b>确定取消该订单吗?</b>',
-      nzContent: `<b>取消后无法恢复，请确认</b>`,
+      nzTitle: text,
+      nzContent: `<b>通过后不可修改，可以再生成电子单据。</b>`,
      nzOnOk: () =>
-        this.service.request(this.service.$api_get_cancelAnOrder, { id: item.id }).subscribe(res => {
+        this.service.request(this.service.$api_get_billAuditPass, params).subscribe(res => {
          if (res === true) {
            this.service.msgSrv.success('操作成功！');
            this.st?.reload(1);
@ -439,8 +455,30 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
        })
    });
  }
-  // 修改订单
-  changeOrder(value: any) {
-    this.router.navigate(['order-management/bulk-detailChange', value.id]);
+  // 批量生成电子单据
+  sign1(item?: any) {
+    if(this.selectedRows.length <= 0) {
+      this.service.msgSrv.error('请选择订单！')
+      return
+    }
+    let params: any[] = [];
+    this.selectedRows.forEach(item => {
+      params.push(item.id);
+    });
+    this.modal.confirm({
+      nzTitle: `<b>已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？</b>`,
+      nzContent: `<b>确认后单据不可修改，请谨慎操作。</b>`,
+      nzOnOk: () =>
+        this.service.request(this.service.$api_get_cancelAnOrder, { ids: params }).subscribe(res => {
+          if (res === true) {
+            this.service.msgSrv.success('操作成功！');
+            this.st?.reload(1);
+            this.getGoodsSourceStatistical();
+            this.initST();
+          }
+          this.st?.reload(1);
+          this.getGoodsSourceStatistical();
+        })
+    });
  }
 }
--- a/src/app/routes/order-management/services/order-management.service.ts
+++ b/src/app/routes/order-management/services/order-management.service.ts
@ -4,7 +4,7 @@
 * @Author       : Shiming
 * @Date         : 2021-12-03 15:31:52
 * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-24 09:58:40
+ * @LastEditTime : 2022-01-24 15:51:21
 * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
 * Copyright (C) 2022 huzhenhong. All rights reserved.
 */
@ -99,10 +99,6 @@ export class OrderManagementService extends ShipperBaseService {
  $api_set_modifyBulkOrder = `/api/sdc/billOperate/modifyBulkOrder`;
  // 修改-整车订单
  $api_set_modifyWholeOrder = `/api/sdc/billOperate/modifyWholeOrder`;
-  // 修改-整车订单详情
-  $api_set_getWholeOrderDetail = `/api/sdc/billOperate/getWholeOrderDetail`;
-  // 修改--大宗订单详情
-  $api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`;
  // 批量修改网络货运人
  $api_set_updateEnterpriseInfoBatch = `/api/sdc/billOperate/updateEnterpriseInfoBatch`;
  // 批量修改附加费率
@ -138,7 +134,7 @@ export class OrderManagementService extends ShipperBaseService {
    // 修改单据审核
  public $api_get_updateBillExamine = '/api/sdc/billExamine/updateBillExamine';
    // 单据审核通过
-  public $api_get_billAuditPass = '/api/sdc/billExamine/billAuditPass';
+  public $api_get_billAuditPass = '/api/sdc/billExamine/billAuditPassBatch';


    // 查询规则抽查列表