fix bug
This commit is contained in:
wangshiming
@ -13,9 +13,25 @@
|
||||
<div nz-row>
|
||||
<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'" acl [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
|
||||
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl [acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
|
||||
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
|
||||
<button
|
||||
nz-button
|
||||
(click)="cancleGoodsSource()"
|
||||
*ngIf="i?.resourceStatus === '1'"
|
||||
acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']"
|
||||
>取消货源</button
|
||||
>
|
||||
<button
|
||||
nz-button
|
||||
(click)="updatePrice(i)"
|
||||
*ngIf="i?.resourceStatus === '1'"
|
||||
acl
|
||||
[acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']"
|
||||
>修改单价</button
|
||||
>
|
||||
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']"
|
||||
>再下一单</button
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mt-sm mb-sm" nz-row>
|
||||
@ -44,14 +60,16 @@
|
||||
nzIcon="solution"
|
||||
[nzDescription]="i?.createAt"
|
||||
nzTitle="下单"
|
||||
[nzSubtitle]="i?.createTime"
|
||||
></nz-step>
|
||||
<nz-step
|
||||
*ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
|
||||
[nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
|
||||
nzIcon="file-done"
|
||||
[nzTitle]="i?.resourceStatus === '2' ? '已完结' : '完结'"
|
||||
[nzTitle]="i?.resourceStatus === '2' ? '已完结' : '完结'" [nzSubtitle]="i?.endTime"
|
||||
></nz-step>
|
||||
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
|
||||
|
||||
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'" [nzSubtitle]="i?.endTime"></nz-step>
|
||||
</nz-steps>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -7,31 +7,55 @@
|
||||
</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?.enterpriseInfoName}}</div>
|
||||
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.enterpriseInfoName }}</div>
|
||||
<div nz-col nzSpan="10">
|
||||
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
|
||||
<button nz-button (click)="assignedCar(i)"
|
||||
*ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']">重新指派</button>
|
||||
<button nz-button (click)="updateGoodsSource(i)" *ngIf="i?.resourceStatus === '1'" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']">修改货源</button>
|
||||
<button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']">再下一单</button>
|
||||
<button
|
||||
nz-button
|
||||
(click)="cancleGoodsSource()"
|
||||
*ngIf="i?.resourceStatus === '1'"
|
||||
acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']"
|
||||
>取消货源</button
|
||||
>
|
||||
<button
|
||||
nz-button
|
||||
(click)="assignedCar(i)"
|
||||
*ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'"
|
||||
acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehicleAnew']"
|
||||
>重新指派</button
|
||||
>
|
||||
<button
|
||||
nz-button
|
||||
(click)="updateGoodsSource(i)"
|
||||
*ngIf="i?.resourceStatus === '1'"
|
||||
acl
|
||||
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-changeSupply']"
|
||||
>修改货源</button
|
||||
>
|
||||
<button nz-button nzType="primary" nzGhost (click)="nextOrder(i)" acl [acl-ability]="['SUPPLY-VEHICLE-DETAIL-vehiclePlaceOrder']"
|
||||
>再下一单</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?.externalResourceCode }} </sv>
|
||||
<sv label="项目">{{i?.enterpriseProjectName}}</sv>
|
||||
<sv label="录单员">{{i?.createUserName}}/{{i?.createUserPhone}}</sv>
|
||||
<sv label="调度员">{{i?.dispatchName}}/{{i?.dispatchPhone}} </sv>
|
||||
<sv label="服务类型">{{i?.serviceTypeLabel}} </sv>
|
||||
<sv label="项目">{{ i?.enterpriseProjectName }}</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,46 +63,61 @@
|
||||
<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-step
|
||||
[nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
|
||||
nzIcon="solution"
|
||||
[nzDescription]="i?.createAt"
|
||||
nzTitle="下单"
|
||||
[nzSubtitle]="i?.createTime"
|
||||
></nz-step>
|
||||
<nz-step
|
||||
*ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
|
||||
[nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
|
||||
nzIcon="file-done"
|
||||
[nzTitle]="'接单'"
|
||||
[nzSubtitle]="i?.endTime"
|
||||
></nz-step>
|
||||
<nz-step
|
||||
nzStatus="finish"
|
||||
nzIcon="close-circle"
|
||||
nzTitle="取消货源"
|
||||
*ngIf="i?.resourceStatus === '3'"
|
||||
[nzSubtitle]="i?.endTime"
|
||||
></nz-step>
|
||||
</nz-steps>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
|
||||
<nz-card nzTitle="基本信息">
|
||||
<sv-container col="2">
|
||||
<sv-title>货物信息</sv-title>
|
||||
<ng-container *ngFor="let item of i?.goodsInfoVOList">
|
||||
<sv label="货物名称">
|
||||
{{item.goodsName}}
|
||||
</sv>
|
||||
<sv label="货物数量">
|
||||
{{item.weight}}吨,{{item.volume}}方,{{item.number}}件
|
||||
{{ item.goodsName }}
|
||||
</sv>
|
||||
<sv label="货物数量"> {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 </sv>
|
||||
</ng-container>
|
||||
</sv-container>
|
||||
<sv-container class="mt-md">
|
||||
<sv-title>承运信息</sv-title>
|
||||
<sv label="司机姓名">
|
||||
{{i?.carrierInformationVO?.driverName}}
|
||||
{{ i?.carrierInformationVO?.driverName }}
|
||||
</sv>
|
||||
<sv label="手机号">
|
||||
{{i?.carrierInformationVO?.driverTelephone}}
|
||||
{{ i?.carrierInformationVO?.driverTelephone }}
|
||||
</sv>
|
||||
<sv label="车牌号">
|
||||
{{i?.carrierInformationVO?.driverLicensePlate}}
|
||||
{{ i?.carrierInformationVO?.driverLicensePlate }}
|
||||
</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>
|
||||
<h4 class="text-md"
|
||||
>装货卸货信息
|
||||
<span class="ml-sm text-sm"
|
||||
>(
|
||||
<label>{{ i?.loadingCount }}装</label>
|
||||
<label>{{ i?.unloadingCount }}卸</label>
|
||||
)
|
||||
</span>
|
||||
</h4>
|
||||
@ -89,12 +128,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?.loadingTime}}</p>
|
||||
<p class="time-info">装货时间：{{ i?.loadingTime }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
@ -103,12 +142,12 @@
|
||||
<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?.unloadingTime}}</p>
|
||||
<p class="time-info">卸货时间：{{ i?.unloadingTime }}</p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -118,27 +157,25 @@
|
||||
<nz-card nzTitle="服务信息">
|
||||
<sv-container>
|
||||
<sv label="增值服务套餐">
|
||||
{{i?.insuranceTypeLabel}}
|
||||
{{ i?.insuranceTypeLabel }}
|
||||
</sv>
|
||||
<sv label="货物价值">
|
||||
{{i?.goodsValue |currency}}
|
||||
</sv>
|
||||
<sv label="保价费金额">
|
||||
{{i?.insurancePremium |currency}} 元
|
||||
{{ i?.goodsValue | currency }}
|
||||
</sv>
|
||||
<sv label="保价费金额"> {{ i?.insurancePremium | currency }} 元 </sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card [nzTitle]="'运费信息（到货后'+i?.paymentDays+'天内支付运费）'">
|
||||
<st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{show:false}">
|
||||
<nz-card [nzTitle]="'运费信息（到货后' + i?.paymentDays + '天内支付运费）'">
|
||||
<st [data]="i?.expenseVOList" [columns]="expenseColumns" [page]="{ show: false }">
|
||||
<ng-template st-row="total" let-item>
|
||||
<div>
|
||||
{{item?.totalAmount | currency}}
|
||||
{{ item?.totalAmount | currency }}
|
||||
<span>(含附加费）</span>
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template st-row="price" let-item>
|
||||
<div>
|
||||
{{item?.price | currency}}
|
||||
{{ item?.price | currency }}
|
||||
</div>
|
||||
</ng-template>
|
||||
</st>
|
||||
@ -147,9 +184,9 @@
|
||||
<h3>
|
||||
<label>总计 :</label>
|
||||
<span class="text-error-dark text-xl">
|
||||
{{(i?.totalAmount) | currency}}
|
||||
{{ i?.totalAmount | currency }}
|
||||
</span>
|
||||
<span>（运费{{i?.totalFreight | currency}}含附加运费 {{i?.totalSurcharge| currency}}）</span>
|
||||
<span>（运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}）</span>
|
||||
</h3>
|
||||
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
|
||||
</div>
|
||||
@ -158,24 +195,23 @@
|
||||
<nz-card nzTitle="补充信息">
|
||||
<sv-container>
|
||||
<sv label="是否回单">
|
||||
{{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
|
||||
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
|
||||
</sv>
|
||||
<sv label="回单类型">
|
||||
{{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
|
||||
</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" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
</st>
|
||||
<st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
|
||||
</nz-card>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user