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

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

@@ -30,8 +30,8 @@ export class OrderManagementComplaintComponent implements OnInit {
   columns: STColumn[] = [];
   selectedIndex: number = 0;
   mainTabs = [
-    { name: '投诉', status: '1' },
+    { name: '司机投诉', status: '1' },
-    { name: '被投诉', status: '2' },
+    { name: '货主投诉', status: '2' },
   ]
   tabs = [  {
     name: '全部',

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-02-25 11:38:11
+ * @LastEditTime : 2022-03-22 17:44:13
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -17,44 +17,50 @@
 </page-header-wrapper>
 <nz-card nzTitle="运单信息">
   <sv-container labelWidth="150" col="2">
-    <sv label="订单号">{{datailList?.billCode}}</sv>
+    <sv label="订单号">{{i?.billCode}}</sv>
     <sv label="申诉状态">
-      <span *ngIf="datailList?.representationsStatus == 1">待申述</span>
+      <span *ngIf="i?.representationsStatus == 1">待申述</span>
-      <span *ngIf="datailList?.representationsStatus == 2">申述中</span>
+      <span *ngIf="i?.representationsStatus == 2">申述中</span>
-      <span *ngIf="datailList?.representationsStatus == 2">申述成功</span>
+      <span *ngIf="i?.representationsStatus == 2">申述成功</span>
-      <span *ngIf="datailList?.representationsStatus == 4">申诉失败</span>
+      <span *ngIf="i?.representationsStatus == 4">申诉失败</span>
     </sv>
-    <sv label="承运司机">{{datailList?.driverName}} / {{datailList?.driverPhoneNumber}} / {{i?.carId}}</sv>
+    <sv label="承运司机">{{i?.driverName}} / {{i?.driverPhoneNumber}} / {{i?.carId}}</sv>
-    <sv label="收款人"> {{datailList?.payeeName}} / {{datailList?.payeePhoneNumber}} </sv>
+    <sv label="收款人"> {{i?.payeeName}} / {{i?.payeePhoneNumber}} </sv>
-    <sv label="装货时间">{{datailList?.loadTime}}</sv>
+    <sv label="装货时间">{{i?.loadTime}}</sv>
-    <sv label="卸货时间">{{datailList?.unloadTime}}</sv>
+    <sv label="卸货时间">{{i?.unloadTime}}</sv>
-    <sv label="装货地">{{datailList?.loadingPlace}}</sv>
+    <sv label="装货地">{{i?.loadingPlace}}</sv>
-    <sv label="卸货地">{{datailList?.dischargePlace}}</sv>
+    <sv label="卸货地">{{i?.dischargePlace}}</sv>
     <sv label="异常原因" col="1">
       <div class="bg-grey-lighter p-sm">
-        <div *ngFor="let items of datailList?.billComplianceVOS">
+        <div *ngFor="let items of i?.billComplianceVOS">
           <div>{{items.complianceName}}</div>
         </div>
       </div>
     </sv>
   </sv-container>
 </nz-card>
-<nz-card nzTitle="申诉信息" >
+<!-- <nz-card nzTitle="申诉信息" >
-  <sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema" [formData]="datailList">
+  <sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema" [formData]="i">
     <ng-template sf-template="enterpriseQualificationCe" let-schema="schema" let-item let-ui="ui">
-      <app-imagelist [imgList]="datailList?.fileArr"></app-imagelist>
+      <app-imagelist [imgList]="i?.fileArr"></app-imagelist>
+    </ng-template>
+  </sf>
+</nz-card> -->
+<nz-card nzTitle="申诉信息" >
+  <sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="i" [formData]="i">
+    <ng-template sf-template="uploadVanchor" let-schema="schema" let-me let-ui="ui">
+      <!-- <nz-upload *ngIf="me.formProperty.value" [nzFileList]="me.formProperty.value" [nzShowButton]="false"
+        [nzShowUploadList]="{showRemoveIcon:false}">
+      </nz-upload> -->
+      <app-imagelist *ngIf="i.fileArr" [imgList]="i.fileArr"></app-imagelist>
     </ng-template>
   </sf>
 </nz-card>
-
 <nz-card class="dealBox" nzTitle="申诉处理">
   <nz-timeline nzMode="left">
-    <nz-timeline-item nzLabel="2015-09-01" nzColor="green">申诉成功</nz-timeline-item>
+    <nz-timeline-item [nzLabel]="item?.operatorTimestamp" nzColor="green" *ngFor="let item of logList">
-    <nz-timeline-item nzLabel="2015-09-01 09:12:11">重新提交申诉申请<div class="info">操作人员：张三</div>
+      <div>{{item?.operationContent}}</div>
-    </nz-timeline-item>
+      <div>操作人:{{item?.operator}}</div>
-    <nz-timeline-item nzLabel="2015-09-01 09:12:11">驳回<div class="info">操作人员：张三</div>
-    </nz-timeline-item>
-    <nz-timeline-item nzLabel="2015-09-01 09:12:11">提交申诉申请<div class="info">操作人员：张三</div>
     </nz-timeline-item>
   </nz-timeline>
 </nz-card>

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

@@ -24,7 +24,7 @@ export class OrderManagementRiskDetailComponent implements OnInit {
   //   '运单轨迹严重异常'
   // ]
   i: any;
-  datailList: any;
+  logList: any = [];
   id: string = '';
   constructor(private modal: NzModalService, public service: OrderManagementService, public ar: ActivatedRoute) {
     this.id = this.ar.snapshot.params.id;
@@ -41,7 +41,7 @@ export class OrderManagementRiskDetailComponent implements OnInit {
   initSF() {
     this.schema = {
       properties: {
-        representationsCause: {
+        representationsCauseLabel: {
           title: '申诉原因',
           type: 'string',
           maxLength: 30,
@@ -65,7 +65,7 @@ export class OrderManagementRiskDetailComponent implements OnInit {
           readOnly: true
 
         } as SFTextareaWidgetSchema,
-        enterpriseQualificationCe: {
+        uploadVanchor: {
           type: 'string',
           title: '上传凭证',
           ui: {
@@ -96,13 +96,39 @@ export class OrderManagementRiskDetailComponent implements OnInit {
       },
     };
   }
-  getDetail(id: string) {
+    /**
-    this.service.request(this.service.$api_get_getRiskDetail, { id }).subscribe(res => {
+   * 获取详情
-      if (res) {
+   * @param id
-        this.datailList = res;
+   */
-      }
+     getDetail(id: string) {
-    })
+      this.service.request(this.service.$api_get_getRiskDetail, { id }).subscribe(res => {
-  }
+        if (res) {
+          this.i = Object.assign({}, res);
+          console.log(this.i);
+          let list: any = [];
+          this.i.fileArr.map((item: any, index: number) => {
+            const obj = {
+              uid: index,
+              name: '文件' + (index + 1),
+              status: 'done',
+              url: item,
+            };
+            list.push(obj);
+          });
+          this.i.uploadVanchor = list;
+          this.initSF();
+          this.getLog(this.i?.billCode);
+        }
+      })
+    }
+  // getDetail(id: string) {
+
+  //   this.service.request(this.service.$api_get_getRiskDetail, { id }).subscribe(res => {
+  //     if (res) {
+  //       this.i = res;
+  //     }
+  //   })
+  // }
 
   edit(item: any): void {
     const modalRef = this.modal.create({
@@ -123,5 +149,12 @@ export class OrderManagementRiskDetailComponent implements OnInit {
   goBack() {
     window.history.go(-1)
   }
-
+ /**
+   * 获取操作日志
+   */
+  getLog(operateObject: any) {
+    this.service.request(this.service.$api_get_risk_order_log, { operateObject, operateType: '8', size: 100 }).subscribe(res => {
+      this.logList = res?.records;
+    })
+  }
 }

src/app/routes/order-management/services/order-management.service.ts

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2021-12-03 15:31:52
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-22 10:49:37
+ * @LastEditTime : 2022-03-22 17:29:07
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -167,6 +167,7 @@ export class OrderManagementService extends ShipperBaseService {
     const params = { dictKey: dictKey };
     return this.request(this.$api_getDictValue, params);
   }
+  $api_get_risk_order_log = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`; // 获取货源的操作日志
   // 获取数据字典
   $api_getDictValue = `/api/mdc/pbc/dictItems/getDictValue`;
   // 获取轨迹

src/app/shared/widget/dict-select/dict-select.widget.ts

@@ -1,5 +1,5 @@
 /*
- * @Description  : 
+ * @Description  :
  * @Version      : 1.0
  * @Author       : Shiming
  * @Date         : 2021-12-13 10:36:49
@@ -37,4 +37,8 @@ export class DictSelectWidget extends ControlWidget implements OnInit {
     if (this.ui.change) this.ui.change(value);
     this.setValue(value);
   }
+
+  reset(value: any) {
+    this.setValue(value);
+  }
 }