车辆对接

2021-12-22 09:50:17 +08:00
parent c79ea5261f
commit d40830c870
11 changed files with 334 additions and 190 deletions
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-21 14:20:15
+ * @LastEditTime: 2021-12-21 17:13:11
 * @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\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -14,7 +14,7 @@
  </ng-template>
  <ng-template #headerContent>
    <div class="mb-xs" nz-row>
-      <h4 class="ml-md">订单号: {{ i?.billCode }}</h4>
+      <h4 class="ml-md" style="font-size: 18px;">订单号: {{ i?.billCode }}</h4>
    </div>
    <div nz-row style="display: flex; justify-content: end;">
      <div nz-col nzSpan="10">
@ -25,16 +25,25 @@
        <button nz-button nzType="primary" nzGhost >再下一单</button>
      </div>
    </div>
-    <div sv-container>
-      <sv label="货主">{{ i?.goodsInfoList[0].shipperAppUserName }} </sv>
-      <sv label="所属项目">{{i?.enterpriseProjectId}}</sv>
-      <sv label="服务类型">{{i?.createUserId}}</sv>
-      <sv label="录单员">{{i?.dispatchName}} 18100000000 </sv>
-      <sv label="调度员">{{i?.serviceTypeLabel}} </sv>
-    </div>
+   <div>
+     <div style="display: flex; justify-content: space-between;">
+      <div sv-container>
+        <sv label="货主">{{ i?.goodsResource[0]?.shipperAppUserName }} </sv>
+        <sv label="所属项目">{{i?.goodsResource[0]?.enterpriseProjectName}}</sv>
+        <sv label="服务类型">{{i?.goodsResource[0]?.serviceTypeLabel}}</sv>
+        <sv label="录单员">{{i?.goodsResource[0]?.dispatchName}} 18100000000 </sv>
+        <sv label="调度员">{{i?.goodsResource[0]?.dispatchName}} </sv>
+      </div>
+      <div>
+        <div>状态</div>
+        <div style="font-size: 22px;font-weight: 700;">{{i?.billStatusLabel}}</div>
+      </div>
+     </div>
+  
+   </div>
  </ng-template>
 </page-header-wrapper>
-<nz-card nzTitle="货源进度">
+<nz-card nzTitle="运单进度">
  <div class="approval-status">
    <div style="width: 60%; margin: 0 auto">
      <nz-steps [nzLabelPlacement]="'vertical'">
@ -53,30 +62,28 @@
    <div nz-row [nzGutter]="24">
      <div nz-col [nzSpan]="12">
        <div class="handling-info p-md">
-          <div class="flex" *ngFor="let item of i?.unLoadingPlaceList">
-            <div *ngIf="item.type === '1'" class="loading-row">
-              <div class="handling-info-icon loading-bg">装</div>
+          <div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
+            <div *ngIf="item?.type === '1'" class="loading-row">
              <div class="info">
-                <h4>装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</h4>
-                <p>联系人：{{item.appUserName}}/{{item.contractTelephone}}</p>
+                <h4>装货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4>
+                <p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
              </div>
            </div>
          </div>
-          <p class="time-info">装货时间：{{i?.loadingTime}}</p>
+          <p class="time-info">计划装货时间：{{i?.goodsResource[0]?.loadingTime}}</p>
        </div>
      </div>
      <div nz-col [nzSpan]="12">
        <div class="handling-info p-md">
-          <div class="flex" *ngFor="let item of i?.unLoadingPlaceList">
-            <div *ngIf="item.type === '2'" class="loading-row">
-              <div class="handling-info-icon unloaing-bg">卸</div>
+          <div class="flex" *ngFor="let item of i?.unLoadingPlaceList;let idx = index">
+            <div *ngIf="item?.type === '2'" class="loading-row">
              <div class="info">
-                <h4>卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</h4>
-                <p>联系人：{{item.appUserName}}/{{item.contractTelephone}}</p>
+                <h4>卸货地：{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}</h4>
+                <p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
              </div>
            </div>
          </div>
-          <p class="time-info">卸货时间：{{i?.unloadingTime}}</p>
+          <p class="time-info">计划卸货时间：{{i?.goodsResource[0]?.unloadingTime}}</p>
        </div>
      </div>
    </div>
@ -85,24 +92,24 @@
 <nz-card nzTitle="基本信息">
  <sv-container col="1">
      <sv label="网络货运人">
-        {{i?.goodsName}}
+        {{i?.goodsResource[0]?.enterpriseInfoName}}
      </sv>
      <sv label="货物名称">
-        {{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件
+        {{i?.goodsInfoList[0]?.goodsName}}
      </sv>
  </sv-container>
  <sv-container col="2">
      <sv label="货物数量">
-        {{i?.goodsName}}
+        {{i?.goodsInfoList[0]?.weight}}顿,{{i?.goodsInfoList[0]?.volume}}方,{{i?.goodsInfoList[0]?.number}}件
      </sv>
      <sv label="用车需求">
-        {{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件
+        {{i?.goodsInfoList[0]?.maxWeightLabel}}/{{i?.goodsInfoList[0]?.maxCube}}
      </sv>
      <sv label="承运司机">
-        {{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件
+        {{i?.driverId}}
      </sv>
      <sv label="车型车长载重">
-        {{i?.weight}}顿,{{i?.volume}}方,{{i?.number}}件
+        {{i?.goodsInfoList[0]?.weight}}顿,{{i?.goodsInfoList[0]?.volume}}方,{{i?.goodsInfoList[0]?.number}}件
      </sv>
  </sv-container>

@ -112,7 +119,7 @@
 </nz-card>

 <nz-card nzTitle="运费信息">
-  <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">

  </st>
  <div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
@ -127,34 +134,39 @@
  </sv-container>
  <sv-container col="2" class="mt-md">
    <sv label="装货凭证">
-      {{i?.supplementaryInformationVO?.remarks}}
+      <app-imagelist [imgList]="i?.goodsResource">
+      </app-imagelist>
    </sv>
    <sv label="卸货凭证">
-      {{i?.supplementaryInformationVO?.remarks}}
+      <app-imagelist [imgList]="i?.goodsResource">
+      </app-imagelist>
    </sv>
  </sv-container>
 </nz-card>
 <nz-card nzTitle="补充信息">
  <sv-container>
    <sv label="是否回单">
-      {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
+      {{i?.goodsResource?.stateReceipt ?'是':'否'}}
    </sv>
    <sv label="回单类型">
-      {{i?.supplementaryInformationVO?.receiptTypeLabel}}
+      {{i?.goodsResource?.receiptTypeLabel}}
    </sv>
    <sv label="联系人">
-      {{i?.supplementaryInformationVO?.receiptUserName}} / {{i?.supplementaryInformationVO?.phon}}
+      {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
    </sv>
    <sv label="所在地区">
-      {{i?.supplementaryInformationVO?.area}}
+      {{i?.goodsResource?.receiptAddress}}
    </sv>
    <sv label="详细地址">
-      {{i?.supplementaryInformationVO?.address}}
+      {{i?.goodsResource?.receiptAddress}}
+    </sv>
+    <sv label="回单凭证">
+      {{i?.goodsResource?.receiptAddress}}
    </sv>
  </sv-container>
  <sv-container col="1" class="mt-md">
    <sv label="备注">
-      {{i?.supplementaryInformationVO?.remarks}}
+      {{i?.goodsResource?.remarks}}
    </sv>
  </sv-container>
 </nz-card>
--- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
+++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
@ -1,7 +1,7 @@
 /*
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-21 11:22:23
+ * @LastEditTime: 2021-12-21 16:50:27
 * @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\order-management\components\vehicle-detail\vehicle-detail.component.ts
@ -23,8 +23,25 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
  id = this.route.snapshot.params.id;
  i: any;
  logColumns: STColumn[] = [
-    { title: '时间', index: 'operationUserPhone' },
-    { title: '地点', index: ' createTime' },
+    { title: '款项', index: 'costName' },
+    { title: '总费用（元）', index: 'price' },
+    { title: '协议金额（元）', index: 'price' },
+    { title: '附加费（元）', index: 'surcharge' },
+    { title: '附加费率（%）', index: 'paymentMethodRate' },
+    { title: '支付时间', index: ' paymentTime' },
+    {
+      title: '支付状态',
+      className: 'text-center',
+      index: 'paymentStatus',
+      type: 'badge',
+      width: '120px',
+      badge: {
+        '1': { text: '待申请', color: 'warning' },
+        '2': { text: '已支付', color: 'success' },
+        '3': { text: '已拒绝', color: 'warning' },
+        '4': { text: '申请中', color: 'warning' },
+      },
+    },
  ];

  constructor(