车辆对接

2021-12-24 17:50:47 +08:00
parent 3fa2476b52
commit adaaebee99
12 changed files with 1346 additions and 50 deletions
--- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2021-12-23 13:38:07
+ * @LastEditTime: 2021-12-24 17:39:12
 * @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
@ -20,18 +20,18 @@
      <div nz-col nzSpan="10">
        <button nz-button  >确认发车</button>
        <button nz-button >取消订单</button>
-        <button nz-button  >修改订单</button>
+        <button nz-button  (click)="changeOrder()">修改订单</button>
        <button nz-button nzType="primary" nzGhost >再下一单</button>
      </div>
    </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>
+        <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>
@ -81,18 +81,18 @@
 <nz-card nzTitle="运单进度">
  <div class="approval-status">
    <div style="width: 60%; margin: 0 auto">
-      <nz-steps [nzLabelPlacement]="'vertical'">
+      <!-- <nz-steps [nzLabelPlacement]="'vertical'">
        <nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
          [nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
        <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' "
          [nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzTitle]="'接单'"></nz-step>
        <nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
-      </nz-steps>
+      </nz-steps> -->
    </div>
  </div>
 </nz-card>

-<nz-card nzTitle="装卸货信息(一装一卸)" id="distannce1">
+<nz-card nzTitle="装卸货信息(一装一卸)" id="distannce1" >
  <div class="mt-md">
    <div nz-row [nzGutter]="24">
      <div nz-col [nzSpan]="12">
@ -105,7 +105,6 @@
              </div>
            </div>
          </div>
-          <p class="time-info">计划装货时间：{{i?.goodsResource[0]?.loadingTime}}</p>
        </div>
      </div>
      <div nz-col [nzSpan]="12">
@ -118,42 +117,51 @@
              </div>
            </div>
          </div>
-          <p class="time-info">计划卸货时间：{{i?.goodsResource[0]?.unloadingTime}}</p>
        </div>
      </div>
    </div>
  </div>
 </nz-card>
+
 <nz-card nzTitle="基本信息" id="distannce2">
  <sv-container col="1">
-      <sv label="网络货运人">
-        {{i?.goodsResource[0]?.enterpriseInfoName}}
-      </sv>
      <sv label="货物名称">
-        {{i?.goodsInfoList[0]?.goodsName}}
+        {{i?.goodsInfoList?.[0]?.goodsName}}
      </sv>
  </sv-container>
  <sv-container col="2">
      <sv label="货物数量">
-        {{i?.goodsInfoList[0]?.weight}}顿,{{i?.goodsInfoList[0]?.volume}}方,{{i?.goodsInfoList[0]?.number}}件
+        {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
      </sv>
      <sv label="用车需求">
-        {{i?.goodsInfoList[0]?.maxWeightLabel}}/{{i?.goodsInfoList[0]?.maxCube}}
+        {{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCube}}
      </sv>
      <sv label="承运司机">
        {{i?.driverId}}
      </sv>
      <sv label="车型车长载重">
-        {{i?.goodsInfoList[0]?.weight}}顿,{{i?.goodsInfoList[0]?.volume}}方,{{i?.goodsInfoList[0]?.number}}件
+        {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
+      </sv>
+      <sv label="计划装货时间">
+        {{i?.loadPlanTime}}
+      </sv>
+      <sv label="计划卸货时间">
+        {{i?.unloadPlanTime}}
+      </sv>
+      <sv label="接单数量">
+        {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
+      </sv>
+      <sv label="装货数量">
+        {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
+      </sv>
+      <sv label="卸货数量">
+        {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件
      </sv>
  </sv-container>
-
-
-</nz-card>
-<nz-card nzTitle="保险待定">
 </nz-card>

 <nz-card nzTitle="运费信息" id="distannce3">
+  <h2>{{i?.freightPrice}}{{i?.freightTypeLabel}}（以发货为准，保留小数）</h2>
  <st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">

  </st>
@ -164,16 +172,18 @@
 <nz-card nzTitle="附件信息" id="distannce4">
  <sv-container>
    <sv label="协议附件">
-      {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
+      <!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
+      <a href="javascript:;" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
+      <a href="javascript:;" (click)="agreement('2')">补充协议</a>
    </sv>
  </sv-container>
  <sv-container col="2" class="mt-md">
    <sv label="装货凭证">
-      <app-imagelist [imgList]="[i?.goodsResource]">
+      <app-imagelist [imgList]="[i?.loadingLadingBillFilePath,i?.loadingPeopleVehiclesGoodsFilePath]">
      </app-imagelist>
    </sv>
    <sv label="卸货凭证">
-      <app-imagelist [imgList]="[i?.goodsResource]">
+      <app-imagelist [imgList]="[i?.unloadingLadingBillFilePath,i?.unloadingPeopleVehiclesGoodsFilePath]">
      </app-imagelist>
    </sv>
  </sv-container>
@ -195,11 +205,12 @@
    <sv label="详细地址">
      {{i?.goodsResource?.receiptAddress}}
    </sv>
-    <sv label="回单凭证">
-      {{i?.goodsResource?.receiptAddress}}
-    </sv>
+  
  </sv-container>
  <sv-container col="1" class="mt-md">
+    <sv label="回单凭证">
+      <app-imagelist [imgList]="[i?.receiptFilePath]"></app-imagelist>
+    </sv>
    <sv label="备注">
      {{i?.goodsResource?.remarks}}
    </sv>
@ -211,8 +222,8 @@
    <nz-card nzTitle="轨迹信息" style="width: 100%;" id="distannce5">
      <div nz-row > 
        <div nz-col [nzSpan]='12'>
-    <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
-    </st>
+    <!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
+    </st> -->
  </div>
  <div nz-col [nzSpan]='12'>
     <amap-path-simplifier></amap-path-simplifier>
@ -220,4 +231,14 @@
   </div>
    </nz-card>
  </div>
-</nz-card>
+</nz-card>
+
+<nz-modal [(nzVisible)]="isVisible"   [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
+  <ng-container *nzModalContent>
+    <app-imagelist [imgList]="imges"></app-imagelist>
+  </ng-container>
+  <ng-template #nzModalFooter>
+    <button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
+    <button nz-button nzType="default" (click)="handleCancel()">确定  </button>
+  </ng-template>
+</nz-modal>