From c0a087584f98872758d87a6ec71b0454386f1501 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Wed, 30 Mar 2022 16:51:04 +0800
Subject: [PATCH] fix bug

---
 .../receipts-audit.component.ts               | 26 ++++++++++++-------
 .../services/order-management.service.ts      | 11 +++++++-
 .../dynamic-setting-h5.component.html         |  4 +--
 .../dynamic-setting-h5.component.ts           |  2 +-
 4 files changed, 29 insertions(+), 14 deletions(-)

diff --git 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
index c20719db..1ee4249a 100644
--- 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
@@ -544,16 +544,22 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
       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();
-        })
+        // 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();
+        // })
+    {   
+       this.service.downloadFile(this.service.$api_createBillTakeGoods,{billIds: params})
+
+       
+       this.service.downloadFile(this.service.$api_createBillDischargeGoods,{billIds: params})}
+        
     });
   }
    // 获取所属项目
diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts
index 4955b61e..21b45d1c 100644
--- 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-03-28 11:07:48
+ * @LastEditTime : 2022-03-30 16:08:50
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -163,6 +163,15 @@ export class OrderManagementService extends ShipperBaseService {
   // 异常预警
   public $api_getAbnormalWarningByBillId = '/api/sdc/abnormalWarning/getAbnormalWarningByBillId';
 
+  // 生成卸货单
+  public $api_createBillDischargeGoods = '/api/sdc/billOperate/createBillDischargeGoods';
+  // 生成提货单
+  public $api_createBillTakeGoods = '/api/sdc/billOperate/createBillTakeGoods';
+  // 生成卸货单-页面展示
+  public $api_getBillDischargeGoodsVO = '/api/sdc/billOperate/getBillDischargeGoodsVO';
+  // 生成提货单-页面展示
+  public $api_getBillTakeGoodsVO = '/api/sdc/billOperate/getBillTakeGoodsVO';
+
   getDictByKey(dictKey: string) {
     const params = { dictKey: dictKey };
     return this.request(this.$api_getDictValue, params);
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
index 6cb03f06..743e721c 100644
--- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-25 16:03:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-09 16:17:28
+ * @LastEditTime : 2022-03-30 16:50:35
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -100,7 +100,7 @@
                                 </ng-container>
                                 <!-- 开关选项 -->
                                 <ng-container *ngSwitchCase="10">
-                                    <nz-switch [ngModel]="item.itemValue" style="margin-left: 26px;"></nz-switch>
+                                    <nz-switch [(ngModel)]="item.itemValue" style="margin-left: 26px;"></nz-switch>
                                 </ng-container>
                                 <!-- 下拉单选 -->
                                 <ng-container *ngSwitchCase="11">
diff --git a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts
index 0523979a..14ba8893 100644
--- a/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts
+++ b/src/app/shared/components/dynamic-setting/dynamic-setting-h5/dynamic-setting-h5.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-25 16:03:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-22 19:59:59
+ * @LastEditTime : 2022-03-30 16:50:00
  * @FilePath     : \\tms-obc-web\\src\\app\\shared\\components\\dynamic-setting\\dynamic-setting-h5\\dynamic-setting-h5.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */