运单优化

2022-04-28 20:42:47 +08:00
parent 92b9335df4
commit bbc3095852
6 changed files with 217 additions and 214 deletions
--- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
@ -13,29 +13,7 @@
    </button>
  </ng-template>
  <ng-template #headerContent>
-    <div nz-row>
-      <button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.wayBillStatusLabel}}</button>
-      <h4 class="ml-md" style="font-size: 18px;">运单号: {{ i?.wayBillCode }}</h4>
-    </div>
-    <div nz-row style="display: flex; justify-content: end;" class="mb-xs">
-      <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>
-      <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>
      <nz-tabset style="margin-top: 15px;">
        <nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
        </nz-tab>
@ -51,20 +29,21 @@
    </div>
  </ng-template>
 </page-header-wrapper>
-<nz-card #distannce1>
-  <div class="mb-sm common-order-header" nz-row>
+<nz-card [nzBorderless]="true" class="mb0" #distannce1>
+  <div class=" 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>
+      <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 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>
+  <nz-divider class="mt-sm mb-sm"></nz-divider>
+  <div class="mb-lg">
    <div sv-container>
      <sv label="网络货运人">{{ i?.enterpriseInfoName }} </sv>
      <sv label="货主">{{ i?.shippername }} </sv>
@ -85,7 +64,7 @@
    </div>
  </div>
 </nz-card>
-<nz-card>
+<nz-card [nzBorderless]="true" class="mb0">
  <div class="font-weight-blod text-md detail-title">
    <a class="sign"></a>
    <span>装货卸货信息</span>
@ -96,27 +75,27 @@
    </span>
  </div>
  <div nz-row [nzGutter]="24">
-    <div nz-col [nzSpan]="12">
+    <div class="handling-col" 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>
+              <p class="mb0">联系人：{{item.appUserName}}/{{item.contractTelephone}}</p>
            </div>
          </div>
        </div>
      </div>
    </div>
-    <div nz-col [nzSpan]="12">
+    <div class="handling-col" 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>
+              <p class="mb0">联系人：{{item.appUserName}}/{{item.contractTelephone}}</p>
            </div>
          </div>
        </div>
@ -194,14 +173,16 @@
 结算依据为1时，卸货时间不为空，显示运费信息，否则隐藏
 结算依据为2时，装货时间不为空，显示运费信息，否则隐藏
 -->
-<nz-card [nzTitle]="priceTitel" #distannce3
+<nz-card #distannce3
  [hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)"
  [nzBorderless]="true" class="mb0">
+  <div class="font-weight-blod text-md detail-title">
+    <a class="sign"></a>
+    <span>运费信息</span>
+    <span class="pl-sm text-warning">到货后{{i?.goodsResource?.paymentDays}}天内支付运费</span>
+  </div>
+

-  <ng-template #priceTitel>
-    <span>运费信息</span><span
-      style="padding-left: 24px; color: #f59a23;font-size: small;">到货后{{i?.goodsResource.paymentDays}}天内支付运费</span>
-  </ng-template>
  <div style="margin-bottom: 18px">
    <span style="color: #da001b; font-size: 18px"> {{ i?.freightPrice }}{{ i?.freightTypeLabel }} </span>（{{
    i?.settlementBasisLabel }}，{{
@ -223,7 +204,11 @@
  </div>
  <div *ngIf=" i?.payeeId !== i?.driverId" class="mt-xs">车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
 </nz-card>
-<nz-card nzTitle="附件信息" [nzBorderless]="true" class="mb0" #distannce4>
+<nz-card [nzBorderless]="true" class="mb0" #distannce4>
+  <div class="font-weight-blod text-md detail-title">
+    <a class="sign"></a>
+    <span>附件信息</span>
+  </div>
  <sv-container>
    <sv label="协议附件">
      <a *ngIf="i?.contractContent?.contractContent" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
@ -241,7 +226,11 @@
    </sv>
  </sv-container>
 </nz-card>
-<nz-card nzTitle="补充信息" [nzBorderless]="true" class="mb0">
+<nz-card [nzBorderless]="true" class="mb0">
+  <div class="font-weight-blod text-md detail-title">
+    <a class="sign"></a>
+    <span>补充信息</span>
+  </div>
  <sv-container>
    <sv label="是否回单">
      {{i?.receiptType == 1 ?'是':'否'}}
@ -270,7 +259,7 @@
  </sv-container>
 </nz-card>

-<nz-card class="mb0">
+<nz-card class="mb0" [nzBorderless]="true">
  <p class="detail_title" #distannce5><span>|</span> 轨迹信息</p>
  <div nz-row>
    <div nz-col [nzSpan]="24">