UI优化
This commit is contained in:
潘晓云
@ -6,7 +6,7 @@
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
|
||||
-->
|
||||
<page-header-wrapper [title]="'大宗运单详情'" [logo]="logo" [content]="headerContent">
|
||||
<page-header-wrapper [title]="'大宗运单详情'" [logo]="logo">
|
||||
<ng-template #logo>
|
||||
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
|
||||
<i nz-icon nzType="left" nzTheme="outline"></i>
|
||||
@ -51,10 +51,33 @@
|
||||
</div>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card nzTitle="运单进度" #distannce1>
|
||||
<nz-card #distannce1>
|
||||
<div class="mb-sm common-order-header" nz-row>
|
||||
<div>
|
||||
<button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.wayBillStatusLabel}}</button>
|
||||
<b class="ml-md text-md">运单号: {{ i?.wayBillCode }}</b>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col>
|
||||
<button nz-button *ngIf="i?.wayBillStatus == '2'" (click)="sureDepart(i)" acl
|
||||
[acl-ability]="['WAYBILL-BULK-DETAIL-insertBulkStartCarInfo']">确认发车</button>
|
||||
<button nz-button nzType="primary" *ngIf="i?.wayBillStatus == '3'" (click)="sureArrive(i)" nzGhost acl
|
||||
[acl-ability]="['WAYBILL-BULK-DETAIL-insertBulkUnloadCarInfo']">确认到车</button>
|
||||
</div>
|
||||
<div>
|
||||
<div sv-container>
|
||||
<sv label="网络货运人">{{ i?.enterpriseInfoName }} </sv>
|
||||
<sv label="货主">{{ i?.shippername }} </sv>
|
||||
<sv label="所属项目">{{i?.enterpriseProjectName}}</sv>
|
||||
<sv label="服务类型">{{i?.serviceTypeLabel}}</sv>
|
||||
<sv label="调度员">{{i?.dispatchName}} /{{i?.dispatchPhone}}</sv>
|
||||
<sv label="外部订单号">{{ i?.externalBillCode }}</sv>
|
||||
<sv label="货源编号">{{ i?.resourceCode }} </sv>
|
||||
<sv label="承诺付款天数">{{ i?.paymentDays }}</sv>
|
||||
</div>
|
||||
</div>
|
||||
<div class="approval-status">
|
||||
<div style="width: 60%; margin: 0 auto">
|
||||
|
||||
<div class="step-row">
|
||||
<nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
|
||||
<nz-step *ngFor="let item of i?.scheduleVOList" [nzTitle]="item.state" [nzSubtitle]="item.stateTime"
|
||||
[nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"></nz-step>
|
||||
@ -62,8 +85,51 @@
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
<nz-card>
|
||||
<div class="font-weight-blod text-md detail-title">
|
||||
<a class="sign"></a>
|
||||
<span>装货卸货信息</span>
|
||||
<span class="ml-sm text-sm">(
|
||||
<label>{{i?.loadingNumber || '一'}}装</label>
|
||||
<label>{{i?.dischargeNumber || '一'}}卸</label>
|
||||
)
|
||||
</span>
|
||||
</div>
|
||||
<div nz-row [nzGutter]="24">
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<div class="flex" *ngFor="let item of i?.loadingPlace">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<div class="flex" *ngFor="let item of i?.dischargePlace">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nz-card>
|
||||
|
||||
<nz-card nzTitle="基本信息" #distannce1>
|
||||
<nz-card [nzBorderless]="true" class="mb0" #distannce1>
|
||||
<div class="font-weight-blod text-md detail-title">
|
||||
<a class="sign"></a>
|
||||
<span>基本信息</span>
|
||||
</div>
|
||||
<sv-container col="1">
|
||||
<sv label="货物名称">
|
||||
{{i?.goodsInfos?.[0]?.goodsName}}
|
||||
@ -99,43 +165,7 @@
|
||||
{{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方
|
||||
</sv>
|
||||
</sv-container>
|
||||
<div class="mt-md">
|
||||
<h4 class="text-md">装货卸货信息
|
||||
<span class="ml-sm text-sm">(
|
||||
<label>{{i?.loadingNumber || '一'}}装</label>
|
||||
<label>{{i?.dischargeNumber || '一'}}卸</label>
|
||||
)
|
||||
</span>
|
||||
</h4>
|
||||
<div nz-row [nzGutter]="24">
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<div class="flex" *ngFor="let item of i?.loadingPlace">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col [nzSpan]="12">
|
||||
<div class="handling-info p-md">
|
||||
<div class="flex" *ngFor="let item of i?.dischargePlace">
|
||||
<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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</nz-card>
|
||||
<!-- <nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
|
||||
<h2>{{i?.freightPrice}}{{i?.goodsInfos?.[0]?.freightTypeLabel}}（{{ i?.goodsInfos?.[0]?.settlementBasisLabel ? i?.goodsInfos?.[0]?.settlementBasisLabel + '，' :' ' }}{{i?.goodsInfos?.[0]?.ruleLabel}}）</h2>
|
||||
@ -165,7 +195,9 @@
|
||||
结算依据为2时，装货时间不为空，显示运费信息，否则隐藏
|
||||
-->
|
||||
<nz-card [nzTitle]="priceTitel" #distannce3
|
||||
[hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)">
|
||||
[hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)"
|
||||
[nzBorderless]="true" class="mb0">
|
||||
|
||||
<ng-template #priceTitel>
|
||||
<span>运费信息</span><span
|
||||
style="padding-left: 24px; color: #f59a23;font-size: small;">到货后{{i?.goodsResource.paymentDays}}天内支付运费</span>
|
||||
@ -176,7 +208,7 @@
|
||||
i?.ruleLabel
|
||||
}}）
|
||||
</div>
|
||||
<st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
<st size="small" #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
<ng-template st-row="prices" let-item let-index="index">
|
||||
{{ item.price + item.surcharge | currency }}
|
||||
</ng-template>
|
||||
@ -191,7 +223,7 @@
|
||||
</div>
|
||||
<div *ngIf=" i?.payeeId !== i?.driverId" class="mt-xs">车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="附件信息" #distannce4>
|
||||
<nz-card nzTitle="附件信息" [nzBorderless]="true" class="mb0" #distannce4>
|
||||
<sv-container>
|
||||
<sv label="协议附件">
|
||||
<a *ngIf="i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a>
|
||||
@ -209,7 +241,7 @@
|
||||
</sv>
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
<nz-card nzTitle="补充信息">
|
||||
<nz-card nzTitle="补充信息" [nzBorderless]="true" class="mb0">
|
||||
<sv-container>
|
||||
<sv label="是否回单">
|
||||
{{i?.receiptType == 1 ?'是':'否'}}
|
||||
@ -238,7 +270,7 @@
|
||||
</sv-container>
|
||||
</nz-card>
|
||||
|
||||
<nz-card>
|
||||
<nz-card class="mb0">
|
||||
<p class="detail_title" #distannce5><span>|</span> 轨迹信息</p>
|
||||
<div nz-row>
|
||||
<div nz-col [nzSpan]="24">
|
||||
@ -265,4 +297,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