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

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-01-18 17:19:25
+ * @LastEditTime : 2022-02-25 11:38:11
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -32,7 +32,9 @@
     <sv label="卸货地">{{datailList?.dischargePlace}}</sv>
     <sv label="异常原因" col="1">
       <div class="bg-grey-lighter p-sm">
-        {{datailList?.abnormalCause}}
+        <div *ngFor="let items of datailList?.billComplianceVOS">
+          <div>{{items.complianceName}}</div>
+        </div>
       </div>
     </sv>
   </sv-container>

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

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-01-18 19:49:23
+ * @LastEditTime : 2022-02-25 11:30:51
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -72,6 +72,11 @@
         <p>装货时间：{{ item?.loadTime }}</p>
         <p>卸货时间：{{ item?.unloadTime }}</p>
       </ng-template>
+      <ng-template st-row="billComplianceVOS" let-item let-index="index">
+        <div *ngFor="let items of item?.billComplianceVOS">
+          <div>{{items.complianceName}}</div>
+        </div>
+      </ng-template>
       <ng-template st-row="driverName" let-item let-index="index">
         <div> {{ item?.driverName }}/{{ item?.driverPhoneNumber }} </div>
       </ng-template>

src/app/routes/order-management/components/risk/risk.component.ts

@@ -246,7 +246,7 @@ export class OrderManagementRiskComponent implements OnInit {
         title: '异常信息',
         width: '200px',
         className: 'text-left',
-        index: 'billComplianceVOS'
+        render: 'billComplianceVOS'
       },
       { title: '托运人', index: 'shipperName', width: '200px', className: 'text-left' },
       { title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html

@@ -32,7 +32,10 @@
                   />
                 </nz-input-group>
               
-                <span  style="padding: 0 10px"
+                <span *ngIf="idx !== 0" [ngClass]="idx == 0 ? 'hides' : ''" style="padding: 0 10px"
+                  ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
+                ></span>
+                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
                   ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
                 ></span>
               </div>
@@ -93,7 +96,10 @@
                     placeholder="请输入卸货地"
                   />
                 </nz-input-group>
-                <span style="padding: 0 10px"><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span>
+                <span *ngIf="idx !== 0" style="padding: 0 10px"><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i></span>
+                <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px"
+                ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
+              ></span>
               </div>
             </nz-form-control>
           </nz-form-item>

src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less

@@ -50,3 +50,7 @@ input[type='number']::-webkit-outer-spin-button {
   margin: 0;
   -webkit-appearance: none;
 }
+.hides {
+  margin-left: 10px;
+  color: aqua;
+}

src/app/routes/supply-management/components/vehicle/vehicle.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-02-11 10:30:16
+ * @LastEditTime : 2022-02-25 11:18:30
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\vehicle\\vehicle.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -65,6 +65,7 @@
       [columns]="columns"
       [req]="{ params: reqParams }"
       [res]="{ process: afterRes }"
+      [page]="{ }"
       [loading]="service.http.loading"
       [scroll]="{ x: '1200px', y: '500px' }"
     >

src/app/routes/supply-management/components/vehicle/vehicle.component.ts

@@ -65,9 +65,10 @@ export class SupplyManagementVehicleComponent implements OnInit {
   afterRes = (data: any[], rawData?: any) => {
     return data.map(item => ({
       ...item,
-      disabled: item.auditStatus !== '1'
+      disabled: item.auditStatus !== '1',
     }));
   };
+  
   get selectedRows() {
     return this.st?.list.filter(item => item.checked) || [];
   }