车辆对接

2021-12-20 17:18:40 +08:00
parent f18f512aac
commit 0a31c9eb4e
33 changed files with 1275 additions and 768 deletions
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.html
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-20 09:56:30
+ * @LastEditTime: 2021-12-20 17:07:17
 * @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
@ -47,30 +47,62 @@
    #st
    [bordered]="true"
    [scroll]="{ x: '2000px' }"
-    [data]="service.$api_get_getWholeBillDetail"
+    [data]="service.$api_get_listWholePage"
    [columns]="columns"
    [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, 30, 50, 100, 200, 300, 500, 1000] }"
-    [loadingDelay]="500"
-    [loading]="service.http.loading"
+ 
    >
    <ng-template st-row="billCode" let-item let-index="index">
      <a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
      <div>
-        <span *ngIf="item?.wayBillStatus == 1">待接单</span>
-        <span *ngIf="item?.wayBillStatus == 2">待发车</span>
-        <span *ngIf="item?.wayBillStatus == 3">运输中</span>
-        <span *ngIf="item?.wayBillStatus == 4">待签收</span>
-        <span *ngIf="item?.wayBillStatus == 5">已完成</span>
-        <span *ngIf="item?.wayBillStatus == 6">已取消</span>
+        <span>{{item?.billStatusLabel}}</span>
      </div>
    </ng-template>
+    <ng-template st-row="goodsName" let-item let-index="index">
+      <div>{{item?.goodsName}}</div>
+      <div>
+        <span>{{item?.weight ? item?.weight + '吨/' : '' }}</span>
+        <span>{{item?.volume ? item?.volume + '方/' : '' }}</span>
+        <span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
+      </div>
+    </ng-template>
+       <!-- 运费明细 -->
+       <!-- <ng-template st-row="mybidDetailInfo" let-item let-index="index">
+        <div *ngFor="let i of item?.mybidDetailInfo">
+          <div></div>
+        </div>
+      </ng-template> -->
+      <ng-template st-row="mybidDetailInfo" let-item let-index="index">
+        <div *ngIf="item.mybidDetailInfo.length > 0">
+          <p *ngFor="let data of item.mybidDetailInfo">
+            {{ data.expenseName }}：{{ data.price }}
+            <span *ngIf="data.paymentStatus" style="color: #f59a63">{{ data.paymentStatus }}</span>
+          </p>
+        </div>
+      </ng-template>
    <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
      <div *ngFor="let i of item?.billExpenseDetailVOList; let ii = index">
        <span >{{i?.costName}}：{{i?.price}}</span>
      </div>
    </ng-template>
+    <ng-template st-row="driverName" let-item let-index="index">
+    <div>
+      {{item?.driverName}}
+    </div>
+    <div>
+      {{item?.driverPhone}}
+    </div>
+    </ng-template>
+    <ng-template st-row="payeeName" let-item let-index="index">
+    <div>
+      {{item?.payeeName}}
+    </div>
+    <div>
+      {{item?.payeePhone}}
+    </div>
+    </ng-template>
    <ng-template st-row="loadingTime" let-item let-index="index">
      <div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
      <div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
@ -102,21 +134,23 @@
 </nz-card>


-<nz-modal [(nzVisible)]="isVisible"  [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="浮动费用" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
+<nz-modal [(nzVisible)]="isVisible"  [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
  <ng-container *nzModalContent>
    <st
    #stFloat
    multiSort
    size="small"
    [bordered]="true"
-    [data]="service.$api_get_getWholeBillDetail"
+    [data]="service.$api_get_listChangeApply"
    [columns]="columnsFloat"
-    [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, 30, 50, 100, 200, 300, 500, 1000] }"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }"
+    [res]="{ reName: { list: 'data', total: 'data.total' } }"
    [loadingDelay]="500"
+    
  >
-
+  <ng-template st-row="order" let-item let-index="index">
+    {{ index + 1 }}
+  </ng-template>
  </st>
  </ng-container>
  <ng-template #nzModalFooter>
@ -133,11 +167,10 @@
    multiSort
    size="small"
    [bordered]="true"
-    [data]="datass"
+    [data]="service.$api_get_getChangeRecordWholeDetail"
    [columns]="columnsFloatView"
-    [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, 30, 50, 100, 200, 300, 500, 1000] }"
+    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeViewParams }"
+    [res]="{ reName: { list: 'data', total: 'data.total' } }"
    [loadingDelay]="500"
  >
  </st>
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/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)
+          }
+        })
+      });
+    }
 }