From e233980308c4d49e3365c8fd3d7dafaf135ece5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= <xiaoyun.pan@eascs.com>
Date: Thu, 28 Apr 2022 15:34:14 +0800
Subject: [PATCH] =?UTF-8?q?UI=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bulk-detail/bulk-detail.component.html    | 40 ++++++++++++-------
 .../vehicle-detail.component.html             | 16 ++++----
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
index b1beb110..020c7594 100644
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
@@ -6,11 +6,19 @@
       </button>
     </ng-template>
     <ng-template #headerContent>
-      <div class="mb-xs" nz-row>
+      <div class="mb-sm common-order-header" nz-row>
         <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
-        <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
+        <b class="ml-md">货源编码 : {{ i?.resourceCode }}</b>
       </div>
-      <div class="common-order-header" nz-row>
+      <div>
+        <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 class="common-order-header" nz-row>
         <div class="common-grey">网络货运人：{{ i?.shipperAppUserName }}</div>
         <div>
           <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
@@ -20,7 +28,7 @@
           <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
             [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
         </div>
-      </div>
+      </div> -->
       <!-- <div class="mt-sm mb-sm" nz-row>
         <div>
           <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b>
@@ -28,6 +36,7 @@
       </div> -->
       <nz-divider></nz-divider>
       <div sv-container>
+        <sv label="网络货运人">{{ i?.shipperAppUserName }}</sv>
         <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
         <sv label="截止时间">{{ i?.deadlineTime }}</sv>
         <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
@@ -37,12 +46,11 @@
     </ng-template>
   </page-header-wrapper>
   <nz-card [nzBorderless]="true" class="mb0">
-    <div class="mb-xs" nz-row>
-      <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
-      <h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
-    </div>
-    <div class="common-order-header" nz-row>
-      <div class="common-grey">网络货运人：{{ i?.shipperAppUserName }}</div>
+    <div class="mb-sm common-order-header" nz-row>
+      <div>
+        <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
+        <b class="ml-md">货源编码 : {{ i?.resourceCode }}</b>
+      </div>
       <div>
         <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
           [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
@@ -59,6 +67,7 @@
     </div> -->
     <nz-divider class="divider-margin"></nz-divider>
     <div class="mb-lg" sv-container>
+      <sv label="网络货运人">{{ i?.shipperAppUserName }}</sv>
       <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
       <sv label="截止时间">{{ i?.deadlineTime }}</sv>
       <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
@@ -174,21 +183,22 @@
     <div class="font-weight-blod text-md detail-title">
       <a class="sign mr-xs"></a>
       <span>运费信息</span>
+      <span class="pl-sm text-warning">(到货后{{i?.paymentDays}}天内支付运费)</span>
     </div>
     <div>
       <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>
-          </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>（附加费率{{i?.rate * 100 | number: '0.2-2'}}%）</span>
           </div>
+          <nz-divider class="mb-xs mt-xs"></nz-divider>
+          <div>
+            <!-- <p class="text-warning-light mb-xs text-right">收货后{{ i?.paymentDays }}天内支付运费</p> -->
+            <p class="mb0 text-right"> {{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}</p>
+          </div>
         </div>
       </div>
     </div>
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
index 43c1da1b..94f27bc7 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
@@ -8,13 +8,12 @@
       </ng-template>
     </page-header-wrapper>
     <nz-card [nzBorderless]="true" class="mb0">
-      <div class="mb-xs" nz-row>
-        <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="10">
+      <div class="mb-sm common-order-header" nz-row>
+        <div>
+          <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
+          <b class="ml-md">货源编码 : {{ i?.resourceCode }}</b>
+        </div>
+        <div>
           <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
@@ -32,7 +31,8 @@
         </div>
       </div> -->
       <nz-divider class="divider-margin"></nz-divider>
-      <div class="mb-lg" sv-container *ngIf="i">
+      <div class="mb-lg" sv-container>
+        <sv label="网络货运人">{{ i?.enterpriseInfoName }} </sv>
         <sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
         <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
         <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>