Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/order-management/components/complaint/complaint.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 11:13:18
+ * @LastEditTime : 2022-03-23 10:11:08
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -19,30 +19,18 @@
   </ng-template>
 </page-header-wrapper>
 <nz-card>
-  <div nz-row nzGutter="8">
-    <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
-    <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-      <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="false"
-        (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
-    </div>
-
+  <div nz-row nzGutter="12">
     <!-- 查询字段大于3个时，根据展开状态调整布局 -->
-    <ng-container *ngIf="queryFieldCount > 4">
-      <div nz-col [nzSpan]="_$expand ? 24 : 18">
+      <div nz-col [nzSpan]="18">
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
-      <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
+      <div nz-col [nzSpan]="6" >
         <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="false"
           (click)="st?.load(1)"  acl  [acl-ability]="['ORDER-COMPLAINT-search']">查询</button>
-        <button nz-button nzType="primary" 
+        <button nz-button nzType="primary" acl  [acl-ability]="['ORDER-COMPLAINT-export']"
          >导出</button>
         <button nz-button (click)="resetSF()">重置</button>
-        <button nz-button nzType="link" (click)="expandToggle()">
-          {{ !_$expand ? '展开' : '收起' }}
-          <i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
-        </button>
       </div>
-    </ng-container>
   </div>
 </nz-card>
 

src/app/routes/order-management/components/risk-detail/risk-detail.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-16 10:19:08
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-22 18:02:17
+ * @LastEditTime : 2022-03-22 18:08:04
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -21,8 +21,8 @@
     <sv label="申诉状态">
       <span >{{i?.representationsStatusLabel}}</span>
     </sv>
-    <sv label="承运司机">{{i?.driverName}} / {{i?.driverPhoneNumber}} / {{i?.carId}}</sv>
-    <sv label="收款人"> {{i?.payeeName}} / {{i?.payeePhoneNumber}} </sv>
+    <sv label="承运司机">{{i?.driverName ? i?.driverName + '/': ''}} {{i?.driverPhoneNumber ?i?.driverPhoneNumber + '/': '' }}  {{i?.carId}}</sv>
+    <sv label="车队长"> {{i?.payeeName ? i?.payeeName+ '/' : ''}}{{i?.payeePhoneNumber}} </sv>
     <sv label="装货时间">{{i?.loadTime}}</sv>
     <sv label="卸货时间">{{i?.unloadTime}}</sv>
     <sv label="装货地">{{i?.loadingPlace}}</sv>