From 92ef67a236818d5c1ada9eb3aa7741376df60bba 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:10:54 +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    | 80 ++++++++++++-----
 .../bulk-detail/bulk-detail.component.less    |  2 +-
 .../vehicle-detail.component.html             | 88 +++++++++++--------
 .../vehicle-detail.component.less             |  3 +-
 src/styles/theme.less                         |  4 +
 5 files changed, 113 insertions(+), 64 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 601a0121..b1beb110 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
@@ -10,9 +10,9 @@
         <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="10">
+      <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
             [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
           <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
@@ -21,11 +21,11 @@
             [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
         </div>
       </div>
-      <div class="mt-sm mb-sm" nz-row>
+      <!-- <div class="mt-sm mb-sm" nz-row>
         <div>
           <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b>
         </div>
-      </div>
+      </div> -->
       <nz-divider></nz-divider>
       <div sv-container>
         <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
@@ -41,9 +41,9 @@
       <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="10">
+    <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
           [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
         <button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
@@ -52,13 +52,13 @@
           [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
       </div>
     </div>
-    <div class="mt-sm mb-sm" nz-row>
+    <!-- <div class="mt-sm mb-sm" nz-row>
       <div>
         <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b>
       </div>
-    </div>
-    <nz-divider></nz-divider>
-    <div sv-container>
+    </div> -->
+    <nz-divider class="divider-margin"></nz-divider>
+    <div class="mb-lg" sv-container>
       <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
       <sv label="截止时间">{{ i?.deadlineTime }}</sv>
       <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
@@ -66,8 +66,8 @@
       <sv label="服务类型">{{ i?.serviceTypeLabel }} </sv>
     </div>
     <div class="approval-status">
-      <div style="width: 60%; margin: 0 auto">
-        <nz-steps style="width: 70%; margin: 0 auto" [nzLabelPlacement]="'vertical'">
+      <div class="step-row">
+        <nz-steps [nzLabelPlacement]="'vertical'">
           <nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
             [nzDescription]="i?.createTime" nzTitle="下单"></nz-step>
           <nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '4' "
@@ -80,13 +80,22 @@
       </div>
     </div>
     <div class="mt-md">
-      <h4 class="text-md">装货卸货信息
+      <div class="font-weight-blod text-md detail-title">
+        <a class="sign mr-xs"></a>
+        <span>装货卸货信息</span>
         <span class="ml-sm text-sm">(
           <label>{{ i?.loadingCount || '一' }}装</label>
           <label>{{ i?.unloadingCount || '一' }}卸</label>
           )
         </span>
-      </h4>
+      </div>
+      <!-- <h4 class="text-md">装货卸货信息
+        <span class="ml-sm text-sm">(
+          <label>{{ i?.loadingCount || '一' }}装</label>
+          <label>{{ i?.unloadingCount || '一' }}卸</label>
+          )
+        </span>
+      </h4> -->
       <div nz-row [nzGutter]="24">
         <div nz-col [nzSpan]="12">
           <div class="handling-info p-md">
@@ -95,7 +104,7 @@
                 <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>
@@ -109,7 +118,7 @@
                 <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>
@@ -140,6 +149,15 @@
         <sv label="用车需求">
           {{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}}<span *ngIf="item.carLength !=='999'">米</span>
         </sv>
+        <sv label="承运司机"
+          *ngIf="i?.carrierInformationVO?.driverTelephone && (i?.carrierInformationVO?.driverTelephone !== i?.payeePhone)">
+          {{i?.carrierInformationVO?.driverName || '--'}} / {{i?.carrierInformationVO?.driverTelephone || '--'}} /
+          {{i?.carrierInformationVO?.driverLicensePlate || '--'}}
+        </sv>
+        <sv label="车型车长载重">
+          {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
+          '--')+'吨'}}
+        </sv>
         <!-- <sv label="承运信息">
           {{i?.carrierInformationVO?.driverName}} / {{i?.carrierInformationVO?.driverTelephone}} /
           {{i?.carrierInformationVO?.driverLicensePlate}}
@@ -152,7 +170,11 @@
 
   </nz-card>
 
-  <nz-card [nzBorderless]="true" class="mb0" nzTitle="运费信息">
+  <nz-card [nzBorderless]="true" class="mb0">
+    <div class="font-weight-blod text-md detail-title">
+      <a class="sign mr-xs"></a>
+      <span>运费信息</span>
+    </div>
     <div>
       <div nz-row>
         <div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
@@ -171,7 +193,11 @@
       </div>
     </div>
   </nz-card>
-  <nz-card [nzBorderless]="true" class="mb0" nzTitle="关联订单">
+  <nz-card [nzBorderless]="true" class="mb0">
+    <div class="font-weight-blod text-md detail-title">
+      <a class="sign mr-xs"></a>
+      <span>关联订单</span>
+    </div>
     <sv-container col="5">
       <sv [label]="item?.wayBillStatusLabel" *ngFor="let item of i?.wayBillClassifiedStatisticsVOList">
         (<span [ngClass]="{ 'text-primary': item?.count > 0 }">{{ item?.count }}</span>)
@@ -190,7 +216,11 @@
       </sv> -->
     </sv-container>
   </nz-card>
-  <nz-card [nzBorderless]="true" class="mb0" nzTitle="补充信息">
+  <nz-card [nzBorderless]="true" class="mb0">
+    <div class="font-weight-blod text-md detail-title">
+      <a class="sign mr-xs"></a>
+      <span>补充信息</span>
+    </div>
     <sv-container>
       <sv label="是否回单">
         {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
@@ -213,10 +243,14 @@
       </sv>
     </sv-container>
   </nz-card>
-  <nz-card [nzBorderless]="true" class="mb0" nzTitle="操作日志">
+  <nz-card [nzBorderless]="true" class="mb0">
+    <div class="font-weight-blod text-md detail-title">
+      <a class="sign mr-xs"></a>
+      <span>操作日志</span>
+    </div>
     <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns" [page]="{}"
       [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-      [res]="{ reName: { list: 'data.records', total: 'data.total' } }">
+      [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [size]="'small'">
     </st>
   </nz-card>
 </div>
diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less
index df21f696..ef0733e8 100644
--- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less
+++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less
@@ -48,7 +48,7 @@
   }
 
   .handling-info {
-    min-height: 100px;
+    min-height: 90px;
     border: 1px solid #ccc;
 
     .loading-row {
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 bcb7cb4a..32e40a15 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
@@ -85,50 +85,24 @@
           </nz-steps>
         </div>
       </div>
-    </nz-card>
 
-    <nz-card [nzBorderless]="true" class="mb0">
-      <div class="font-weight-blod text-md detail-title">
-        <a class="sign mr-xs"></a>
-        <span>基本信息</span>
-      </div>
-      <sv-container col="2">
-        <!-- <sv-title>货物信息</sv-title> -->
-        <ng-container *ngFor="let item of i?.goodsInfoVOList">
-          <sv label="货物名称">
-            {{ item.goodsTypeName }} - {{ 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 }}
-        </sv>
-        <sv label="手机号">
-          {{ i?.carrierInformationVO?.driverTelephone }}
-        </sv>
-        <sv label="车牌号">
-          {{ i?.carrierInformationVO?.driverLicensePlate }}
-        </sv>
-      </sv-container>
-      <sv label="承运司机" *ngIf="i?.carrierInformationVO.driverTelephone !== i?.payeePhone">
-        {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} /
-        {{i?.carrierInformationVO.driverLicensePlate || '--'}}
-      </sv>
-      <sv label="车型车长载重">
-        {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
-        '--')+'吨'}}
-      </sv>
       <div class="mt-md">
-        <h4 class="text-md">装货卸货信息
+        <!-- <h4 class="text-md">装货卸货信息
           <span class="ml-sm text-sm">(
             <label>{{ i?.loadingCount }}装</label>
             <label>{{ i?.unloadingCount }}卸</label>
             )
           </span>
-        </h4>
+        </h4> -->
+        <div class="font-weight-blod text-md detail-title">
+          <a class="sign mr-xs"></a>
+          <span>装货卸货信息</span>
+          <span class="ml-sm text-sm">(
+            <label>{{ i?.loadingCount }}装</label>
+            <label>{{ i?.unloadingCount }}卸</label>
+            )
+          </span>
+        </div>
         <div nz-row [nzGutter]="24">
           <div nz-col [nzSpan]="12">
             <div class="handling-info p-md">
@@ -166,6 +140,42 @@
       </div>
     </nz-card>
 
+    <nz-card [nzBorderless]="true" class="mb0">
+      <div class="font-weight-blod text-md detail-title">
+        <a class="sign mr-xs"></a>
+        <span>基本信息</span>
+      </div>
+      <sv-container col="2">
+        <!-- <sv-title>货物信息</sv-title> -->
+        <ng-container *ngFor="let item of i?.goodsInfoVOList">
+          <sv label="货物名称">
+            {{ item.goodsTypeName }} - {{ item.goodsName }}
+          </sv>
+          <sv label="货物数量"> {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 </sv>
+          <sv label="承运司机" *ngIf="i?.carrierInformationVO?.driverTelephone !== i?.payeePhone">
+            {{i?.carrierInformationVO?.driverName || '--'}} / {{i?.carrierInformationVO?.driverTelephone || '--'}} /
+            {{i?.carrierInformationVO?.driverLicensePlate || '--'}}
+          </sv>
+          <sv label="车型车长载重">
+            {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight ||
+            '--')+'吨'}}
+          </sv>
+        </ng-container>
+      </sv-container>
+      <!-- <sv-container class="mt-md">
+        <sv-title>承运信息</sv-title>
+        <sv label="司机姓名">
+          {{ i?.carrierInformationVO?.driverName }}
+        </sv>
+        <sv label="手机号">
+          {{ i?.carrierInformationVO?.driverTelephone }}
+        </sv>
+        <sv label="车牌号">
+          {{ i?.carrierInformationVO?.driverLicensePlate }}
+        </sv>
+      </sv-container> -->
+    </nz-card>
+
     <nz-card [nzBorderless]="true" class="mb0">
       <div class="font-weight-blod text-md detail-title">
         <a class="sign"></a>
@@ -204,7 +214,7 @@
       </st>
       <div class="freight-info-box mt-md" nz-row>
         <div nz-col nzSpan="24">
-          <h3>
+          <h3 class="mb0">
             <label>总计 :</label>
             <span class="text-error-dark text-xl">
               {{ i?.totalAmount | currency }}
@@ -249,7 +259,7 @@
       </div>
       <st #st [data]="service.$api_getOperationLogRecordsList" [columns]="logColumns" [page]="{}"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
-        [res]="{ reName: { list: 'data.records', total: 'data.total' } }">
+        [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [size]="'small'">
         <ng-template st-row="operator" let-item>
           <div>
             {{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }}
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less
index 172f5525..2fd2b362 100644
--- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less
+++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less
@@ -48,7 +48,7 @@
   }
 
   .handling-info {
-    min-height: 176px;
+    min-height: 100px;
     border: 1px solid #ccc;
 
     .loading-row {
@@ -79,6 +79,7 @@
 
     .time-info {
       margin-left: 56px;
+      margin-bottom: 0;
     }
   }
 }
diff --git a/src/styles/theme.less b/src/styles/theme.less
index 1082d2fa..82b97923 100644
--- a/src/styles/theme.less
+++ b/src/styles/theme.less
@@ -24,3 +24,7 @@
 .ant-btn {
   border-radius: 4px;
 }
+
+.ant-card-body {
+  padding: 16px;
+}