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

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

@@ -94,11 +94,11 @@ tabs = {
     this.service.request(this.service.$api_getBulkStatistical).subscribe(res => {
       if (res) {
        res.forEach((element: any) => {
-        if(element.statusLabel === '待发车') {
+        if(element.billStatusLabel === '待发车') {
           this.tabs.stayQuantity = element.quantity
-        } else if (element.statusLabel === '待接单') {
+        } else if (element.billStatusLabel === '待接单') {
           this.tabs.receivedQuantity = element.quantity
-        } else if (element.statusLabel === '待签收') {
+        } else if (element.billStatusLabel === '待签收') {
           this.tabs.cancelQuantity = element.quantity
         } 
        });
@@ -307,6 +307,9 @@ tabs = {
             widget: 'select',
             placeholder: '请选择',
             errors: { required: '请选择货物类型' },
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
             asyncData: () =>
               this.service2.loadConfigByKey('goods.name.config.type').pipe(
                 map((data: any) => {

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-16 10:19:08
- * @LastEditTime: 2022-01-12 15:02:37
+ * @LastEditTime: 2022-01-12 15:20:55
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: \tms-obc-web\src\app\routes\order-management\components\risk-detail\risk-detail.component.html
@@ -30,8 +30,14 @@
 
 <nz-card class="dealBox" nzTitle="投诉处理">
 <nz-timeline nzMode="left">
-  <nz-timeline-item   *ngFor="let i of datailList?.processNodeVOS" [nzLabel]="i?.time">{{i?.nodeNameLabel}}
+  <nz-timeline-item *ngFor="let i of datailList?.processNodeVOS; let id = index" >
-    <div class="info">{{i?.nodeName}}：{{i?.result}}</div>
+    <div class="p mt-sm">{{i?.nodeNameLabel}}</div>
+    <p>
+      处理时间： <span class="p-line">{{i?.time}}</span>
+    </p>
+    <p *ngIf="id !== 0">
+      处理结果： <span class="p-line">{{i?.result}}</span>
+    </p>
   </nz-timeline-item>
 </nz-timeline>
 </nz-card>

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

@@ -135,8 +135,8 @@ export class OrderManagementComplaintComponent implements OnInit {
         index: 'complainantTime',
         className: 'text-center',
       },
-      { title: '托运方', index: 'shipperAppUserId', width: '120px', className: 'text-center' },
+      { title: '托运方', index: 'shipperAppUserName', width: '120px', className: 'text-center' },
-      { title: '司机', index: 'driverId', width: '120px', className: 'text-center' },
+      { title: '司机', index: 'driverIdLabel', width: '120px', className: 'text-center' },
       {
         title: '投诉原因',
         className: 'text-center',

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

@@ -108,11 +108,11 @@ resourceStatus: any;
     this.service.request(this.service.$api_statisticalStatus).subscribe(res => {
       if (res) {
        res.forEach((element: any) => {
-        if(element.statusLabel === '待发车') {
+        if(element.billStatusLabel === '待发车') {
           this.tabs.stayQuantity = element.quantity
-        } else if (element.statusLabel === '待接单') {
+        } else if (element.billStatusLabel === '待接单') {
           this.tabs.receivedQuantity = element.quantity
-        } else if (element.statusLabel === '待签收') {
+        } else if (element.billStatusLabel === '待签收') {
           this.tabs.cancelQuantity = element.quantity
         } 
        });