车辆对接

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

@@ -26,6 +26,8 @@ export class OrderManagementVehicleComponent implements OnInit {
   isVisibleView = false;
   isVisibleEvaluate = false;
   isVisible = false;
+  changeId: any;       // 主页面查看运费变更记录id - 用于运费变更记录
+  changeViewId: any;  // 查看运费变更记录id - 用于查看
   _$expand = false;
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('stFloat') private readonly stFloat!: STComponent;
@@ -90,6 +92,16 @@ export class OrderManagementVehicleComponent implements OnInit {
       ...this.sf?.value,
     };
   }
+  get changeParams() {
+    return {
+      id: this.changeId
+    };
+  }
+  get changeViewParams() {
+    return {
+      id: this.changeViewId
+    };
+  }
   get selectedRows() {
     return this.st?.list.filter((item) => item.checked) || [];
   }
@@ -314,33 +326,34 @@ export class OrderManagementVehicleComponent implements OnInit {
         title: '运费明细',
         width: '100px',
         className: 'text-center',
-        render: 'billExpenseDetailVOList',
+        render: 'mybidDetailInfo',
       },
-      { title: '网络货运人', index: 'enterpriseInfoId', width: '120px', className: 'text-center' },
-      { title: '货主', index: 'shipperAppUserId', width: '120px', className: 'text-center' },
-      { title: '关联运单号', index: 'linkUrl', width: '120px', className: 'text-center' },
+      { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
+      { title: '货主', index: 'shipperAppUserName', width: '120px', className: 'text-center' },
+      { title: '关联运单号', index: 'wayBillCode', width: '120px', className: 'text-center' },
       { title: '货源编号', index: 'resourceCode', width: '120px', className: 'text-center' },
-      { title: '装货地', index: 'loadingPlace', width: '120px', className: 'text-center' },
+      { title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-center' },
       {
         title: '卸货地',
         className: 'text-center',
         width: '120px',
-        index: 'dischargePlace'
+        index: 'unloadingAddressArr'
       },
       {
         title: '货物信息',
         className: 'text-center',
         width: '120px',
+        render: 'goodsName'
       }, {
         title: '承运司机',
         className: 'text-center',
         width: '120px',
-        index: 'driverId'
+        render: 'driverName'
       },
       {
         title: '收款人',
         className: 'text-center',
-        index: 'payeeId',
+        render: 'payeeName',
         width: '100px',
       },
       {
@@ -366,7 +379,7 @@ export class OrderManagementVehicleComponent implements OnInit {
           },
           {
             text: '运费变更记录',
-            click: (_record) => this.OpenPrice(),
+            click: (_record) => this.OpenPrice(_record),
           },
           {
             text: '变更运费',
@@ -397,19 +410,19 @@ export class OrderManagementVehicleComponent implements OnInit {
       {
         title: '序号',
         className: 'text-center',
-        index: 'one', 
+        render: 'order'
       },
       {
         title: '操作时间',
         className: 'text-center',
-        index: 'two', 
+        index: 'applyTime'
       },
       {
         title: '操作人',
         className: 'text-center',
-        index: 'three', 
+        index: 'applyUserName'
       },
-      { title: '状态', index: 'externalSn',  className: 'text-center' },
+      { title: '状态',     index: 'handleStatus',  className: 'text-center' },
       {
         title: '操作',
         fixed: 'right',
@@ -419,9 +432,13 @@ export class OrderManagementVehicleComponent implements OnInit {
             text: '查看',
             click: (_record) => this.FloatView(_record),
           },
+          // {
+          //   text: '查看协议',
+          //   click: (_record, _modal, _instance) => this.view(_record)
+          // },
           {
             text: '撤销',
-            click: (_record) => this.audit(_record),
+            click: (_record) => this.revoke(_record),
           },
         ],
       },
@@ -520,7 +537,9 @@ export class OrderManagementVehicleComponent implements OnInit {
   handleOK() {
     
   }
-  OpenPrice() {
+  OpenPrice(value: any) {
+    console.log(value)
+    this.changeId = value.id;
     this.isVisible = true
   }
    /**
@@ -528,6 +547,8 @@ export class OrderManagementVehicleComponent implements OnInit {
   */
   FloatView(item: any) {
     console.log(item)
+    console.log()
+    this.changeViewId = item.id;
     this.isVisibleView = true
   }
    /**
@@ -573,7 +594,8 @@ export class OrderManagementVehicleComponent implements OnInit {
         nzWidth: '50%',
         nzContent: VehicleSureDepartComponent,
         nzComponentParams: {
-          i: item
+          i: item,
+         Status: 2
         },
         nzFooter: null
       });
@@ -590,4 +612,19 @@ export class OrderManagementVehicleComponent implements OnInit {
         nzFooter: null
       });
     }
+    revoke(item: any) {
+      this.modal.confirm({
+        nzTitle: '是否确定立即撤销费用变更！</i>',
+        nzOnOk: () => 
+        this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
+          console.log(res)
+          if(res) {
+            this.service.msgSrv.success('撤销成功！')
+            this.stFloat.reload()
+          } else {
+            this.service.msgSrv.error(res.msg)
+          }
+        })
+      });
+    }
 }