车辆对接
This commit is contained in:
		| @ -1,140 +1,177 @@ | ||||
| <!-- | ||||
|  * @Author: your name | ||||
|  * @Date: 2021-12-03 15:31:52 | ||||
|  * @LastEditTime: 2021-12-07 15:09:32 | ||||
|  * @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 | ||||
| --> | ||||
| <page-header-wrapper [title]="''" [logo]="logo"> | ||||
| <page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent"> | ||||
|   <ng-template #logo> | ||||
|     <button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()"> | ||||
|       <i nz-icon nzType="left" nzTheme="outline"></i> | ||||
|     </button> | ||||
|   </ng-template> | ||||
| </page-header-wrapper> | ||||
| <nz-card> | ||||
|   <nz-spin *ngIf="!i" class="modal-spin"></nz-spin> | ||||
|   <div nz-row> | ||||
|     <div nz-col nzSpan="4"> | ||||
|       <sv-container class="bdr"> | ||||
|         <sv label="订单号" col="1">{{ i?.no }}</sv> | ||||
|         <sv-title class="text-center text-lg">待接单555</sv-title> | ||||
|         <sv-title> | ||||
|           <div class=""> | ||||
|             <a class="btn-size" (click)="hand()">指派车队长</a> | ||||
|             <!-- <a class="btn-size m-lg mr-lg">取消货源</a> | ||||
|             <a class="btn-size">再下一单</a> --> | ||||
|           </div> | ||||
|         </sv-title> | ||||
|       </sv-container> | ||||
|   <ng-template #headerContent> | ||||
|     <div class="mb-xs" nz-row> | ||||
|       <h4 class="ml-md" style="font-size: 18px;">订单号: {{ i?.billCode }}</h4> | ||||
|     </div> | ||||
|     <div nz-col nzSpan="16" class="approval-status"> | ||||
|       <nz-steps style="width: 80%; margin: 0 auto" [nzLabelPlacement]="'vertical'"> | ||||
|         <nz-step nzStatus="finish" nzIcon="user" [nzDescription]="i?.createAt" nzTitle="下单"></nz-step> | ||||
|         <nz-step nzStatus="finish" nzIcon="solution" nzTitle="完结"></nz-step> | ||||
|     <div nz-row style="display: flex; justify-content: end;"> | ||||
|       <div nz-col nzSpan="10"> | ||||
|         <button nz-button  >取消货源</button> | ||||
|         <button nz-button  | ||||
|          >重新指派</button> | ||||
|         <button nz-button  >修改货源</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> | ||||
|       </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="运单进度"> | ||||
|   <div class="approval-status"> | ||||
|     <div style="width: 60%; margin: 0 auto"> | ||||
|       <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> | ||||
|     </div> | ||||
|   </div> | ||||
|   <nz-divider></nz-divider> | ||||
|   <div sv-container *ngIf="i"> | ||||
|     <sv label="项目名称">{{ i?.owner }}</sv> | ||||
|     <sv label="调度员">32943898021309809423</sv> | ||||
|     <sv label="承诺付款时间">3321944288191034921</sv> | ||||
|     <sv label="服务类型">18112345678</sv> | ||||
|   </div> | ||||
|   <nz-divider></nz-divider> | ||||
|   <div nz-row> | ||||
|     <div nz-col nzSpan="6"> | ||||
|       <div class="source-info"> | ||||
|         <h3>装卸货信息</h3> | ||||
|         <p>装货地:广东省深圳市龙岗区怡亚通大厦</p> | ||||
|         <p>联系人:奥利给/13680058545</p> | ||||
|         <p>卸货地:广东省深圳市福田区岗厦村9巷8号405(新村)</p> | ||||
|         <p>联系人:花花世界/13680058545</p> | ||||
|         <p>发货日期:广东省深圳市福田区岗厦村9巷8号405(新村)</p> | ||||
|         <p>卸货日期:花花世界/13680058545</p> | ||||
|       </div> | ||||
|     </div> | ||||
|     <div nz-col nzSpan="5"> | ||||
|       <div class="source-info bdr bdl pl-md"> | ||||
|         <h3>货物信息</h3> | ||||
|         <p>货物名称:广东省深圳市龙岗区怡亚通大厦</p> | ||||
|         <p>重量/体积:广东省深圳市福田区岗厦村9巷8号405(新村)</p> | ||||
|         <p>车型/车长:花花世界/13680058545</p> | ||||
|       </div> | ||||
|     </div> | ||||
|     <div nz-col nzSpan="5"> | ||||
|       <div class="source-info bdr bdl pl-md"> | ||||
|         <h3>托运信息</h3> | ||||
|         <p>公司名称:广东省深圳市龙岗区怡亚通大厦</p> | ||||
|         <p>联系人:广东省深圳市福田区岗厦村9巷8号405(新村)</p> | ||||
|       </div> | ||||
|     </div> | ||||
|     <div nz-col nzSpan="5"> | ||||
|       <div class="source-info bdr pl-md"> | ||||
|         <h3>承运信息</h3> | ||||
|         <p>司机:广东省深圳市龙岗区怡亚通大厦</p> | ||||
|         <p>车牌号:广东省深圳市福田区岗厦村9巷8号405(新村)</p> | ||||
|         <p>车型/车长/承重:{{'拖车'}} | {{'4.5米'}} | {{'15吨'}}</p> | ||||
|       </div> | ||||
|     </div> | ||||
|     <div class="source-info pl-md"> | ||||
|       <h3>补充信息</h3> | ||||
|       <p style="color: #1890ff;">协议附件</p> | ||||
|       <p style="color: #1890ff;"> 装车附件</p> | ||||
|       <p style="color: #1890ff;">卸货附件</p> | ||||
|       <p style="color: #1890ff;">回单附件</p> | ||||
|     </div> | ||||
|   </div> | ||||
|   <nz-divider></nz-divider> | ||||
|   <div nz-row> | ||||
|     <div class="freight-info-box"> | ||||
|       <h3>运费信息</h3> | ||||
|       <div class="text-right"> | ||||
|         <p><label class="freigth-label">收款人:</label><span>{{400 | currency }}</span></p> | ||||
|         <p><label class="freigth-label">预付:</label><span>{{400 | currency }}</span></p> | ||||
|         <p><label class="freigth-label">油卡:</label><span>{{400 | currency }}</span></p> | ||||
|         <p><label class="freigth-label">到付:</label><span>{{400 | currency }}</span></p> | ||||
|         <p><label class="freigth-label">回单付:</label><span>{{400 | currency}}</span></p> | ||||
|         <p><label class="freigth-label">附加费:</label><span>{{400 | currency }}</span></p> | ||||
|       </div> | ||||
|     </div> | ||||
|     <nz-divider></nz-divider> | ||||
|     <div class="freight-info-box" nz-row> | ||||
|       <div nz-col nzSpan="24"> | ||||
|         <h3 class="text-right"><label>总计 :</label> <span class="text-error-dark text-xl">{{400 | currency }}</span></h3> | ||||
|         <h3 class="text-right">未支付</h3> | ||||
|       </div> | ||||
| </nz-card> | ||||
|  | ||||
|     </div> | ||||
|   </div> | ||||
|   <nz-divider></nz-divider> | ||||
|   <div style="display: flex; justify-content: space-evenly;"> | ||||
|     <div> | ||||
|       <div  style="position: relative;"> | ||||
|         <div style="height: 24px; width: 90px; background-color: #68758e;position: absolute; top: -109%; left: -12%;color: #fff;text-align: center;">平台支付</div> | ||||
|         <span class="leftPadding">司机运输费666</span> | ||||
|         <span class="leftPadding">1000.00</span> | ||||
|         <span class="leftPadding">未支付</span> | ||||
| <nz-card nzTitle="装卸货信息(一装一卸)"> | ||||
|   <div class="mt-md"> | ||||
|     <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;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> | ||||
|               </div> | ||||
|             </div> | ||||
|           </div> | ||||
|           <p class="time-info">计划装货时间:{{i?.goodsResource[0]?.loadingTime}}</p> | ||||
|         </div> | ||||
|       </div> | ||||
|     </div> | ||||
|     <div> | ||||
|       <div style="position: relative;"> | ||||
|         <div style="height: 24px; width: 90px; background-color: #68758e;position: absolute; top: -109%; left: -5%;color: #fff;text-align: center;">货主支付</div> | ||||
|         <span class="leftPadding">司机运输费22</span> | ||||
|         <span class="leftPadding">1000.00</span> | ||||
|         <span class="leftPadding">未支付</span> | ||||
|       </div> | ||||
|       <div> | ||||
|         <span class="leftPadding">附加费</span> | ||||
|         <span class="leftPadding">1000.00</span> | ||||
|         <span class="leftPadding">未支付</span> | ||||
|       <div nz-col [nzSpan]="12"> | ||||
|         <div class="handling-info p-md"> | ||||
|           <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> | ||||
|               </div> | ||||
|             </div> | ||||
|           </div> | ||||
|           <p class="time-info">计划卸货时间:{{i?.goodsResource[0]?.unloadingTime}}</p> | ||||
|         </div> | ||||
|       </div> | ||||
|     </div> | ||||
|   </div> | ||||
|   <nz-divider></nz-divider> | ||||
|    | ||||
| </nz-card> | ||||
| <nz-card nzTitle="基本信息"> | ||||
|   <sv-container col="1"> | ||||
|       <sv label="网络货运人"> | ||||
|         {{i?.goodsResource[0]?.enterpriseInfoName}} | ||||
|       </sv> | ||||
|       <sv label="货物名称"> | ||||
|         {{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}}件 | ||||
|       </sv> | ||||
|       <sv label="用车需求"> | ||||
|         {{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}}件 | ||||
|       </sv> | ||||
|   </sv-container> | ||||
|  | ||||
|  | ||||
| </nz-card> | ||||
| <nz-card nzTitle="保险待定"> | ||||
| </nz-card> | ||||
|  | ||||
| <nz-card nzTitle="运费信息"> | ||||
|   <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> | ||||
|   <div>收款人:</div> | ||||
| </nz-card> | ||||
|  | ||||
| <nz-card nzTitle="附件信息"> | ||||
|   <sv-container> | ||||
|     <sv label="协议附件"> | ||||
|       {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} | ||||
|     </sv> | ||||
|   </sv-container> | ||||
|   <sv-container col="2" class="mt-md"> | ||||
|     <sv label="装货凭证"> | ||||
|       <app-imagelist [imgList]="i?.goodsResource"> | ||||
|       </app-imagelist> | ||||
|     </sv> | ||||
|     <sv label="卸货凭证"> | ||||
|       <app-imagelist [imgList]="i?.goodsResource"> | ||||
|       </app-imagelist> | ||||
|     </sv> | ||||
|   </sv-container> | ||||
| </nz-card> | ||||
| <nz-card nzTitle="补充信息"> | ||||
|   <sv-container> | ||||
|     <sv label="是否回单"> | ||||
|       {{i?.goodsResource?.stateReceipt ?'是':'否'}} | ||||
|     </sv> | ||||
|     <sv label="回单类型"> | ||||
|       {{i?.goodsResource?.receiptTypeLabel}} | ||||
|     </sv> | ||||
|     <sv label="联系人"> | ||||
|       {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}} | ||||
|     </sv> | ||||
|     <sv label="所在地区"> | ||||
|       {{i?.goodsResource?.receiptAddress}} | ||||
|     </sv> | ||||
|     <sv label="详细地址"> | ||||
|       {{i?.goodsResource?.receiptAddress}} | ||||
|     </sv> | ||||
|     <sv label="回单凭证"> | ||||
|       {{i?.goodsResource?.receiptAddress}} | ||||
|     </sv> | ||||
|   </sv-container> | ||||
|   <sv-container col="1" class="mt-md"> | ||||
|     <sv label="备注"> | ||||
|       {{i?.goodsResource?.remarks}} | ||||
|     </sv> | ||||
|   </sv-container> | ||||
| </nz-card> | ||||
|  | ||||
| <nz-card> | ||||
|   <div nz-row> | ||||
|     <nz-card nzTitle="轨迹信息" style="width: 100%;" > | ||||
|       <div nz-row >  | ||||
| @ -148,6 +185,4 @@ | ||||
|    </div> | ||||
|     </nz-card> | ||||
|   </div> | ||||
| </nz-card> | ||||
|  | ||||
|  | ||||
| </nz-card> | ||||
| @ -1,7 +1,7 @@ | ||||
| /* | ||||
|  * @Author: your name | ||||
|  * @Date: 2021-12-03 15:31:52 | ||||
|  * @LastEditTime: 2021-12-20 09:36:26 | ||||
|  * @LastEditTime: 2021-12-22 09:49:57 | ||||
|  * @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 | ||||
| @ -20,11 +20,29 @@ import { OrderManagementService } from '../../services/order-management.service' | ||||
| }) | ||||
| export class OrderManagementBulkeDetailComponent 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( | ||||
| @ -37,13 +55,18 @@ export class OrderManagementBulkeDetailComponent implements OnInit { | ||||
|   } | ||||
|  | ||||
|   ngOnInit(): void { | ||||
|     this.service.http.get(`/user/${this.id}?_allow_anonymous=true&_allow_badcode=true`).subscribe(res => { | ||||
|       console.log(res); | ||||
|       this.i = res | ||||
|     }); | ||||
|     console.log(this.id) | ||||
|     this.initData() | ||||
|   } | ||||
|  | ||||
|  | ||||
|   initData() { | ||||
|     this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => { | ||||
|       console.log(res) | ||||
|       if (res) { | ||||
|         this.i =res; | ||||
|       } | ||||
|     }) | ||||
|   } | ||||
|  | ||||
|   hand() { | ||||
|     this.modalService.create({ | ||||
| @ -56,5 +79,4 @@ export class OrderManagementBulkeDetailComponent implements OnInit { | ||||
|   goBack() { | ||||
|     window.history.go(-1); | ||||
|   } | ||||
|    | ||||
| } | ||||
|  | ||||
		Reference in New Issue
	
	Block a user