车辆接口更新
This commit is contained in:
wangshiming
@ -7,31 +7,32 @@
|
||||
</ng-template>
|
||||
<ng-template #headerContent>
|
||||
<div class="mb-xs" nz-row>
|
||||
<button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.resourceStatusLabel}}</button>
|
||||
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
|
||||
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
|
||||
</div>
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.shipperAppUserName}}</div>
|
||||
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
|
||||
<div nz-col nzSpan="10">
|
||||
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'">取消货源</button>
|
||||
<button nz-button (click)="assignedCar(i)"
|
||||
*ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'">重新指派</button>
|
||||
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'">取消货源</button>
|
||||
<button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'">重新指派</button>
|
||||
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'">修改单价</button>
|
||||
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)">再下一单</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-sm mb-sm" nz-row>
|
||||
<div>
|
||||
<b>总费用：<span class="text-red-light text-md">{{i?.totalAmount | currency: '¥'}}</span></b>
|
||||
<b
|
||||
>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div sv-container *ngIf="i">
|
||||
<sv label="项目">{{i?.enterpriseProjectId}}</sv>
|
||||
<sv label="截止时间">{{i?.deadlineTime}}</sv>
|
||||
<sv label="录单员">{{i?.createUserName}}/{{i?.createUserPhone}}</sv>
|
||||
<sv label="调度员">{{i?.dispatchName}}/{{i?.dispatchPhone}} </sv>
|
||||
<sv label="服务类型">{{i?.serviceTypeLabel}} </sv>
|
||||
<sv label="项目">{{ i?.enterpriseProjectId }}</sv>
|
||||
<sv label="截止时间">{{ i?.deadlineTime }}</sv>
|
||||
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
|
||||
<sv label="调度员">{{ i?.dispatchName }}/{{ i?.dispatchPhone }} </sv>
|
||||
<sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
|
||||
</div>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
@ -39,13 +40,19 @@
|
||||
<div class="approval-status">
|
||||
<div style="width: 60%; margin: 0 auto">
|
||||
<nz-steps style="width: 70%; margin: 0 auto" [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]="i?.resourceStatus === '2'?'已完结':'完结'"></nz-step>
|
||||
<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]="i?.resourceStatus === '2' ? '已完结' : '完结'"
|
||||
></nz-step>
|
||||
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
|
||||
|
||||
</nz-steps>
|
||||
</div>
|
||||
</div>
|
||||
@ -56,20 +63,14 @@
|
||||
<sv-title>货物信息</sv-title>
|
||||
<ng-container *ngFor="let item of i?.goodsInfoList">
|
||||
<sv label="货物名称">
|
||||
{{item?.goodsName}}
|
||||
</sv>
|
||||
<sv label="货物数量">
|
||||
{{item?.weight}}顿 | {{item?.volume}}方
|
||||
</sv>
|
||||
<sv label="剩余">
|
||||
{{10}}顿 | {{10}}方
|
||||
</sv>
|
||||
<sv label="用车需求">
|
||||
{{item?.maxWeight}} | {{item?.maxCube}}米
|
||||
{{ item?.goodsName }}
|
||||
</sv>
|
||||
<sv label="货物数量"> {{ item?.weight }}顿 | {{ item?.volume }}方 </sv>
|
||||
<sv label="剩余"> {{ 10 }}顿 | {{ 10 }}方 </sv>
|
||||
<sv label="用车需求"> {{ item?.maxWeight }} | {{ item?.maxCube }}米 </sv>
|
||||
<sv label="承运信息">
|
||||
{{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} /
|
||||
{{i?.carrierInformationVO?.driverLicensePlate}}
|
||||
{{ i?.carrierInformationVO?.driverName }} / {{ i?.carrierInformationVO?.driverTelephone }} /
|
||||
{{ i?.carrierInformationVO?.driverLicensePlate }}
|
||||
</sv>
|
||||
<!-- <sv label="当前指派">
|
||||
<a (click)="viewCurrentAssign(i)">查看</a>
|
||||
@ -77,10 +78,12 @@
|
||||
</ng-container>
|
||||
</sv-container>
|
||||
<div class="mt-md">
|
||||
<h4 class="text-md">装货卸货信息
|
||||
<span class="ml-sm text-sm">(
|
||||
<label>{{i?.loadingCount || '一'}}装</label>
|
||||
<label>{{i?.unloadingCount || '一'}}卸</label>
|
||||
<h4 class="text-md"
|
||||
>装货卸货信息
|
||||
<span class="ml-sm text-sm"
|
||||
>(
|
||||
<label>{{ i?.loadingCount || '一' }}装</label>
|
||||
<label>{{ i?.unloadingCount || '一' }}卸</label>
|
||||
)
|
||||
</span>
|
||||
</h4>
|
||||
@ -91,8 +94,8 @@
|
||||
<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>
|
||||
@ -105,8 +108,8 @@
|
||||
<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>
|
||||
@ -122,15 +125,13 @@
|
||||
<div nz-row>
|
||||
<div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
|
||||
<div>
|
||||
<p class="text-warning-light mb-xs text-right">到货后{{i?.paymentDays}}天内支付运费</p>
|
||||
<p class="mb-xs text-right">
|
||||
{{settlementBasis[item?.settlementBasis]}}，{{rule[item?.rule]}}</p>
|
||||
<p class="text-warning-light mb-xs text-right">到货后{{ i?.paymentDays }}天内支付运费</p>
|
||||
<p class="mb-xs text-right"> {{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}</p>
|
||||
</div>
|
||||
<nz-divider class="mb-xs mt-xs"></nz-divider>
|
||||
<div class="text-right">
|
||||
<label>单价：</label>
|
||||
<span class="text-error-dark text-xxl">{{item?.freightPrice | currency: '￥'}}
|
||||
{{freightType[item?.freightType]}}</span>
|
||||
<span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{ freightType[item?.freightType] }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -139,7 +140,8 @@
|
||||
<nz-card nzTitle="关联运单">
|
||||
<sv-container col="5">
|
||||
<sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
|
||||
(<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)
|
||||
(<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span
|
||||
>)
|
||||
</sv>
|
||||
<!-- <sv label="运输中">
|
||||
(<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)
|
||||
@ -158,24 +160,31 @@
|
||||
<nz-card nzTitle="补充信息">
|
||||
<sv-container>
|
||||
<sv label="是否回单">
|
||||
{{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
|
||||
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
|
||||
</sv>
|
||||
<sv label="回单类型">
|
||||
{{i?.supplementaryInformationVO?.receiptTypeLabel}}
|
||||
{{ i?.supplementaryInformationVO?.receiptTypeLabel }}
|
||||
</sv>
|
||||
<sv label="所在地区">
|
||||
{{i?.supplementaryInformationVO?.area}}
|
||||
{{ i?.supplementaryInformationVO?.area }}
|
||||
</sv>
|
||||
<sv label="详细地址">
|
||||
{{i?.supplementaryInformationVO?.address}}
|
||||
{{ i?.supplementaryInformationVO?.address }}
|
||||
</sv>
|
||||
<sv label="备注">
|
||||
{{i?.supplementaryInformationVO?.remarks}}
|
||||
{{ i?.supplementaryInformationVO?.remarks }}
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="操作日志">
|
||||
<st #st [data]="i?.auditRecordList" [columns]="logColumns" [page]="{ show: false, showSize: false }">
|
||||
<st
|
||||
#st
|
||||
[data]="service.$api_getOperationLogRecordsList"
|
||||
[columns]="logColumns"
|
||||
[page]="{ show: false, showSize: false }"
|
||||
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
>
|
||||
</st>
|
||||
</nz-card>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user