fix bug
This commit is contained in:
wangshiming
@ -16,13 +16,25 @@
|
||||
</ng-template>
|
||||
<ng-template #headerContent>
|
||||
<div class="mb-xs" nz-row>
|
||||
<button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.billStatusLabel}}</button>
|
||||
<h4 class="ml-md" style="font-size: 18px;">订单号: {{ i?.billCode }}</h4>
|
||||
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.billStatusLabel }}</button>
|
||||
<h4 class="ml-md" style="font-size: 18px">订单号: {{ i?.billCode }}</h4>
|
||||
</div>
|
||||
<div nz-row style="display: flex; justify-content: end;">
|
||||
<div nz-row style="display: flex; justify-content: end">
|
||||
<div nz-col nzSpan="10">
|
||||
<button (click)="cancellation()" nz-button *ngIf="i.billStatus == '4' || i.billStatus == '5' || i.billStatus == '2' || i.billStatus == '3' || i.billStatus == '1'">取消订单</button>
|
||||
<button nz-button (click)="changeOrder()" *ngIf="i.billStatus == '4' || i.billStatus == '5' || i.billStatus == '2' || i.billStatus == '3'" >修改订单</button>
|
||||
<button
|
||||
(click)="cancellation()"
|
||||
nz-button
|
||||
*ngIf="i.billStatus == '4' || i.billStatus == '5' || i.billStatus == '2' || i.billStatus == '3' || i.billStatus == '1'"
|
||||
acl [acl-ability]="['ORDER-VEHICLE-DETAIL-cancelAnOrder']"
|
||||
>取消订单</button
|
||||
>
|
||||
<button
|
||||
nz-button
|
||||
(click)="changeOrder()"
|
||||
*ngIf="i.billStatus == '4' || i.billStatus == '5' || i.billStatus == '2' || i.billStatus == '3'"
|
||||
acl [acl-ability]="['ORDER-VEHICLE-DETAIL-modifyOrder']"
|
||||
>修改订单</button
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
@ -30,65 +42,65 @@
|
||||
<div sv-container>
|
||||
<sv label="网络货运人">{{ i?.goodsResource?.enterpriseInfoName }} </sv>
|
||||
<sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
|
||||
<sv label="所属项目">{{i?.goodsResource?.enterpriseProjectName}}</sv>
|
||||
<sv label="服务类型">{{i?.goodsResource?.serviceTypeLabel}}</sv>
|
||||
<sv label="录单员">{{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} </sv>
|
||||
<sv label="调度员">{{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}} </sv>
|
||||
<sv label="所属项目">{{ i?.goodsResource?.enterpriseProjectName }}</sv>
|
||||
<sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
|
||||
<sv label="录单员">{{ i?.goodsResource?.createUserName }} /{{ i?.goodsResource?.createUserPhone }} </sv>
|
||||
<sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchPhone }} </sv>
|
||||
</div>
|
||||
|
||||
<nz-tabset style="margin-top: 15px;">
|
||||
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)">
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)">
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)">
|
||||
</nz-tab>
|
||||
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)">
|
||||
</nz-tab>
|
||||
<nz-tabset style="margin-top: 15px">
|
||||
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab>
|
||||
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)"> </nz-tab>
|
||||
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab>
|
||||
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)"> </nz-tab>
|
||||
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)"> </nz-tab>
|
||||
</nz-tabset>
|
||||
|
||||
</div>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card nzTitle="运单进度" #distannce1 >
|
||||
<nz-card nzTitle="运单进度" #distannce1>
|
||||
<div class="approval-status">
|
||||
<div style="width: 60%; margin: 0 auto">
|
||||
<nz-steps [nzCurrent]="approvalLsit?.length + 1" nzLabelPlacement="vertical">
|
||||
<nz-step *ngFor="let item of approvalLsit" [nzTitle]="item?.state" [nzSubtitle]="item?.stateTime"
|
||||
[nzStatus]="item?.displayStatus === 'SHOW' ? 'finish' : 'wait'" >
|
||||
</nz-step>
|
||||
</nz-steps>
|
||||
|
||||
<nz-steps [nzCurrent]="approvalLsit?.length + 1" nzLabelPlacement="vertical">
|
||||
|
||||
<nz-step
|
||||
*ngFor="let item of approvalLsit"
|
||||
[nzTitle]="item?.state"
|
||||
[nzSubtitle]="item?.stateTime"
|
||||
[nzStatus]="item?.displayStatus === 'SHOW' ? 'finish' : 'wait'"
|
||||
>
|
||||
|
||||
</nz-step>
|
||||
</nz-steps
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="基本信息" #distannce2 >
|
||||
<nz-card nzTitle="基本信息" #distannce2>
|
||||
<sv-container col="1">
|
||||
<sv-title>货物信息</sv-title>
|
||||
<sv label="网络货运人">
|
||||
{{i?.goodsResource?.enterpriseInfoName}}
|
||||
{{ i?.goodsResource?.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]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 </sv>
|
||||
<sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
|
||||
<sv label="承运司机">
|
||||
{{i?.driverName}}/{{i?.driverPhone}}/{{i?.carNo}}
|
||||
</sv>
|
||||
<sv label="承运司机"> {{ i?.driverName }}/{{ i?.driverPhone }}/{{ i?.carNo }} </sv>
|
||||
<sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
|
||||
</sv-container>
|
||||
<div class="mt-md" >
|
||||
<h4 class="text-md" >装货卸货信息
|
||||
<span class="ml-sm text-sm">(
|
||||
<label>{{i?.loadingCount}}装</label>
|
||||
<label>{{i?.unloadingCount}}卸</label>
|
||||
<div class="mt-md">
|
||||
<h4 class="text-md"
|
||||
>装货卸货信息
|
||||
<span class="ml-sm text-sm"
|
||||
>(
|
||||
<label>{{ i?.loadingCount }}装</label>
|
||||
<label>{{ i?.unloadingCount }}卸</label>
|
||||
)
|
||||
</span>
|
||||
</h4>
|
||||
@ -99,12 +111,12 @@
|
||||
<div *ngIf="item.type === '1'" class="loading-row">
|
||||
<div class="handling-info-icon loading-bg">装</div>
|
||||
<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?.goodsResource?.loadingTime}}</p>
|
||||
<p class="time-info">计划装货时间：{{ i?.goodsResource?.loadingTime }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
@ -113,38 +125,36 @@
|
||||
<div *ngIf="item.type === '2'" class="loading-row">
|
||||
<div class="handling-info-icon unloaing-bg">卸</div>
|
||||
<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?.goodsResource?.unloadingTime}}</p>
|
||||
<p class="time-info">计划卸货时间：{{ i?.goodsResource?.unloadingTime }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="保险待定">
|
||||
</nz-card>
|
||||
<nz-card nzTitle="保险待定"> </nz-card>
|
||||
|
||||
<nz-card nzTitle="运费信息" #distannce3>
|
||||
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
<ng-template st-row="price" let-item let-index="index">
|
||||
{{ item.price | currency}}
|
||||
{{ item.price | currency }}
|
||||
</ng-template>
|
||||
<ng-template st-row="surcharge" let-item let-index="index">
|
||||
{{ item.surcharge | currency}}
|
||||
{{ item.surcharge | currency }}
|
||||
</ng-template>
|
||||
</st>
|
||||
<div>
|
||||
总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span>
|
||||
（运费{{i?.totalFreight | currency}}，
|
||||
附加费{{ i?.totalSurcharge | currency }}，附加费率{{i?.totalRate * 100 }}%）
|
||||
总计：<span style="color: #da001b; font-size: 18px">{{ i?.totalAmount | currency }}</span> （运费{{ i?.totalFreight | currency }}，
|
||||
附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 }}%）
|
||||
</div>
|
||||
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="附件信息" #distannce4>
|
||||
<nz-card nzTitle="附件信息" #distannce4>
|
||||
<sv-container>
|
||||
<sv label="协议附件">
|
||||
<!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
|
||||
@ -154,19 +164,17 @@
|
||||
</sv-container>
|
||||
<sv-container col="2" class="mt-md">
|
||||
<sv label="装货凭证">
|
||||
<app-imagelist [imgList]="[i?.loadingLadingBillFilePath,i?.loadingPeopleVehiclesGoodsFilePath]">
|
||||
</app-imagelist>
|
||||
<app-imagelist [imgList]="[i?.loadingLadingBillFilePath, i?.loadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
|
||||
</sv>
|
||||
<sv label="卸货凭证">
|
||||
<app-imagelist [imgList]="[i?.unloadingLadingBillFilePath,i?.unloadingPeopleVehiclesGoodsFilePath]">
|
||||
</app-imagelist>
|
||||
<app-imagelist [imgList]="[i?.unloadingLadingBillFilePath, i?.unloadingPeopleVehiclesGoodsFilePath]"> </app-imagelist>
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="补充信息">
|
||||
<sv-container>
|
||||
<sv label="是否回单">
|
||||
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
|
||||
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
|
||||
</sv>
|
||||
<sv label="回单类型">
|
||||
{{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
|
||||
@ -178,27 +186,26 @@
|
||||
<sv label="详细地址">
|
||||
{{ i?.supplementaryInformationVO?.address }}
|
||||
</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}}
|
||||
{{ i?.goodsResource?.remarks }}
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
|
||||
<nz-card>
|
||||
<div nz-row>
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%;" id="distannce5" #distannce5>
|
||||
<nz-card nzTitle="轨迹信息" style="width: 100%" id="distannce5" #distannce5>
|
||||
<div nz-row>
|
||||
<div nz-col [nzSpan]='12'>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
</st> -->
|
||||
</div>
|
||||
<div nz-col [nzSpan]='12'>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<amap-path-simplifier></amap-path-simplifier>
|
||||
</div>
|
||||
</div>
|
||||
@ -206,8 +213,7 @@
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()"
|
||||
(nzOnCancel)="handleCancel()">
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
|
||||
<ng-container *nzModalContent>
|
||||
<app-imagelist [imgList]="imges"></app-imagelist>
|
||||
</ng-container>
|
||||
@ -215,4 +221,4 @@
|
||||
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
|
||||
<button nz-button nzType="default" (click)="handleCancel()">确定 </button>
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
</nz-modal>
|
||||
|
||||
Reference in New Issue
Block a user