fix bug

src/app/routes/order-management/components/bulk/bulk.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-14 10:24:58
+ * @LastEditTime: 2021-12-14 15:47:08
  * @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\supply-management\components\vehicle\vehicle.component.html
@@ -38,7 +38,7 @@
 </nz-card>
 
 <nz-card>
-  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
     <nz-tab *ngFor="let tab of tabs; let i = index"  [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
     </nz-tab>
   </nz-tabset>
@@ -56,7 +56,7 @@
     [loading]="service.http.loading"
     >
       <ng-template st-row="goodsId" let-item let-index="index">
-        <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.no}}</a>
+        <a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.id}}</a>
       </ng-template>
       <!-- <ng-template st-row="externalSn" let-item let-index="index">
         <span class="mr-xs">{{111111}}</span>
@@ -65,11 +65,6 @@
       <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 st-row="feiong" let-item let-index="index">
-        <div style="color: aqua;" (click)="OpenPrice()">
-          {{item.no}}
-        </div>
-      </ng-template>
       <ng-template #contentTemplate>
         <div>
           <p>预付：¥200.00</p>
@@ -161,4 +156,22 @@
     <button nz-button nzType="default" (click)="handleCancel('2')">取消</button>
     <button nz-button nzType="primary" (click)="handleOK()">确定</button>
   </ng-template>
-</nz-modal>
+</nz-modal>
+<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> 
+  </div>
+</ng-template>

src/app/routes/order-management/components/bulk/bulk.component.ts

@@ -5,6 +5,8 @@ import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { map } from 'rxjs/operators';
 import { SupplyManagementService } from '../../services/order-management.service';
+import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component';
+import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component';
 
 
 @Component({
@@ -321,6 +323,7 @@ export class OrderManagementBulkComponent implements OnInit {
       {
         title: '运费明细',
         width: '100px',
+        index: 'externalSn',
         className: 'text-center',
       },
       { title: '网络货运人', index: 'externalSn', width: '120px', className: 'text-center' },
@@ -393,7 +396,15 @@ export class OrderManagementBulkComponent implements OnInit {
           },
           {
             text: '运费变更记录',
-            click: (_record) => this.viewEvaluate(_record),
+            click: (_record) => this.OpenPrice(_record),
+          },
+          {
+            text: '变更运费',
+            click: (_record) => this.updateFreight(_record),
+          },
+          {
+            text: '确认签收',
+            click: (_record) => this.confirmReceipt(_record),
           },
         ],
       },
@@ -527,7 +538,7 @@ export class OrderManagementBulkComponent implements OnInit {
   handleOK() {
     
   }
-  OpenPrice() {
+  OpenPrice(item: any) {
     this.isVisible = true
   }
    /**
@@ -543,5 +554,36 @@ export class OrderManagementBulkComponent implements OnInit {
   viewEvaluate(item: any) {
     console.log(item)
     this.isVisibleEvaluate = true
+  }
+    /**
+   *变更运费
+   */
+   updateFreight(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '变更运费',
+      nzWidth: '50%',
+      nzContent: UpdateFreightComponent,
+      nzComponentParams: {
+        i: item
+      },
+      nzFooter: null
+    });
+  }
+ 
+  //  *变更运费
+   
+   confirmReceipt(item: any) {
+    const modalRef = this.modal.create({
+      nzTitle: '确认签收',
+      nzWidth: '50%',
+      nzContent: ConfirReceiptComponent,
+      nzComponentParams: {
+        i: item
+      },
+      nzFooter: null
+    });
+  }
+  userAction() {
+      
   }
 }