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

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:20:55
+ * @LastEditTime: 2022-01-12 17:10:31
  * @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
@@ -33,10 +33,10 @@
   <nz-timeline-item *ngFor="let i of datailList?.processNodeVOS; let id = index" >
     <div class="p mt-sm">{{i?.nodeNameLabel}}</div>
     <p>
-      处理时间： <span class="p-line">{{i?.time}}</span>
+      <span class="p-line">{{i?.time}}</span>
     </p>
-    <p *ngIf="id !== 0">
+    <p >
-      处理结果： <span class="p-line">{{i?.result}}</span>
+       <span class="p-line">{{i?.result}}</span>
     </p>
   </nz-timeline-item>
 </nz-timeline>

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

@@ -22,13 +22,18 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
   schema: SFSchema = {};
   schemaView: SFSchema = {};
   i: any;
-  datailList: any;
+  datailList: any = {
+    complainantName: '',
+    complainantPartyLabel: ''
+  };
+  complaint: any;
   id: string = '';
   constructor(private modal: NzModalService, public service: OrderManagementService, public ar: ActivatedRoute) {
     this.id = this.ar.snapshot.params.id;
   }
 
   ngOnInit(): void {
+ 
     if (this.id)
     {
       this.getDetail(this.id);
@@ -68,7 +73,7 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
           } as SFSelectWidgetSchema,
         },
         complainantName: {
-          title: '投诉人',
+          title: '托运方',
           type: 'string',
           maxLength: 30,
           ui: {
@@ -77,7 +82,7 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
           } as SFSelectWidgetSchema,
         },
         complainantPartyLabel: {
-          title: '被投诉人',
+          title: '司机',
           type: 'string',
           maxLength: 30,
           ui: {
@@ -133,6 +138,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
     this.service.request(this.service.$api_get_getComplaintDriverDetails, { id }).subscribe(res => {
       if (res) {
         this.datailList = res;
+        this.complaint = JSON.parse(this.ar.snapshot.queryParams.detail)
+        this.datailList.complainantName = this.complaint?.shipperAppUserName
+        this.datailList.complainantPartyLabel = this.complaint?.driverIdLabel
+        console.log(this.datailList)
       }
     })
   }

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

@@ -331,6 +331,10 @@ export class OrderManagementComplaintComponent implements OnInit {
     this.channelId = item.id;
   }
   view(value: any) {
-    this.router.navigate(['/order-management/complaint-detail/' + value.id])
+    this.router.navigate(['/order-management/complaint-detail/' + value.id], {
+      queryParams: {
+        detail: JSON.stringify(value)
+      }
+    })
   }
 }

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 15:31:52
- * @LastEditTime: 2022-01-05 14:40:08
+ * @LastEditTime: 2022-01-12 17:33:24
  * @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\vehicle-detail\vehicle-detail.component.html
@@ -168,16 +168,14 @@
       {{i?.goodsResource?.stateReceipt ?'是':'否'}}
     </sv>
     <sv label="回单类型">
-      {{i?.goodsResource?.receiptTypeLabel}}
+      {{ i?.goodsResource?.receiptType === '1' ? '电子回单' : '纸质回单' }}
-    </sv>
-    <sv label="联系人">
-      {{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
     </sv>
+    <sv label="联系人"> {{ i?.goodsResource?.receiptUserName }} / {{ i?.goodsResource?.phon }} </sv>
     <sv label="所在地区">
-      {{i?.goodsResource?.receiptAddress}}
+      {{ i?.goodsResource?.area }}
     </sv>
     <sv label="详细地址">
-      {{i?.goodsResource?.receiptAddress}}
+      {{ i?.goodsResource?.address }}
     </sv>
 
   </sv-container>