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.ts

@@ -172,6 +172,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
   查看评价： 3
   */
   handleCancel(type: string) {
+    if(!this.sfView.valid) {
+      this.service.msgSrv.error('请填写处理结果！')
+      return
+    }
     const paramsa = {
       ...this.sfView.value,
       handleStatus: 0,
@@ -193,6 +197,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
     this.isVisibleRE = false
   }
   handleCancel2() {
+    if(!this.sfView.valid) {
+      this.service.msgSrv.error('请填写处理结果！')
+      return
+    }
     const paramsa = {
       id: this.channelId
     }
@@ -212,6 +220,10 @@ export class OrderManagementComplaintDetailComponent implements OnInit {
   * 审核通过按钮
   */
   handleOK() {
+    if(!this.sfView.valid) {
+      this.service.msgSrv.error('请填写处理结果！')
+      return
+    }
     const paramsa = {
       ...this.sfView.value,
       handleStatus: 1,

src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-24 15:38:08
- * @LastEditTime : 2022-02-23 15:43:24
+ * @LastEditTime : 2022-03-24 15:19:49
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\abnormal-appear\\abnormal-appear.component.html
@@ -43,7 +43,7 @@
 
 <nz-card class="content-box">
   <nz-tabset [(nzSelectedIndex)]="selectedIndex">
-    <nz-tab nzTitle="待回复">
+    <nz-tab [nzTitle]="'待回复(' + tabs?.stayQuantity + ')'">
       <st
         #st
         [data]="service.$api_get_listOperatePage"
@@ -69,10 +69,10 @@
         </ng-template>
       </st>
     </nz-tab>
-    <nz-tab nzTitle="已回复">
+    <nz-tab  [nzTitle]="'已回复(' + tabs?.receivedQuantity + ')'">
       <st
         #st2
-        [data]="service.$api_get_listOperateReplyPage"
+        [data]="service.$api_get_listOperatePage"
         [columns]="columns2"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"

src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts

@@ -37,6 +37,10 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
   edit = false;
   editId = false;
   selectedIndex = 0;
+  tabs = {
+    stayQuantity: 0,
+    receivedQuantity: 0
+  };
 
   columns: STColumn[] = [
     { title: '异常编号', index: 'exceptionCode', width: '180px', className: 'text-left' },
@@ -68,12 +72,14 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
 
   get reqParams() {
     return {
-      ...this.sf?.value
+      ...this.sf?.value,
+      replyStatus: 0
     };
   }
   get reqParams2() {
     return {
-      ...this.sf?.value
+      ...this.sf?.value,
+      replyStatus: 1
     };
   }
 
@@ -81,6 +87,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
 
   ngOnInit(): void {
     this.initSF();
+    this.getGoodsSourceStatistical();
   }
 
   /**
@@ -205,14 +212,31 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
-
+  getGoodsSourceStatistical() {
+    this.tabs = {
+      stayQuantity: 0,
+      receivedQuantity: 0
+    };
+    const params: any = Object.assign({}, this.reqParams || {});
+    this.service.request(this.service.$api_get_listOperateStatus, params).subscribe(res => {
+      if (res) {
+        res.forEach((element: any) => {
+          if (element.replyStatus === '1') {
+            this.tabs.receivedQuantity = element.quantity;
+          } else if (element.replyStatus === '0') {
+            this.tabs.stayQuantity = element.quantity;
+          }
+        });
+      }
+    });
+  }
   search() {
-    console.log(this.selectedIndex);
     if (this.selectedIndex === 0) {
       this.st?.load(1);
     } else {
       this.st2?.load(1);
     }
+    this.getGoodsSourceStatistical();
   }
   /**
    * 重置表单

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime : 2022-03-21 14:53:06
+ * @LastEditTime : 2022-03-24 15:56:23
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
@@ -77,8 +77,8 @@
         <div> {{ item?.payeeName }}/{{ item?.payeePhone }} </div>
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList2" let-item let-index="index">
-        <div *ngIf="item?.billExpenseDetailVOList?.length > 0">
+        <div *ngIf="item?.BillShipperWholeMyBidVO?.length > 0">
-          <p *ngFor="let data of item?.billExpenseDetailVOList"> {{ data?.costName }}：{{ data?.price | currency }} </p>
+          <p *ngFor="let data of item?.BillShipperWholeMyBidVO"> {{ data?.costName }}：{{ data?.price | currency }} </p>
         </div>
       </ng-template>
       <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">

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

@@ -2,7 +2,7 @@ import { WaybillManagementBulkComponent } from './../components/bulk/bulk.compon
 /*
  * @Author: your name
  * @Date: 2021-12-07 14:52:29
- * @LastEditTime : 2022-03-11 17:26:20
+ * @LastEditTime : 2022-03-24 15:17:57
  * @LastEditors  : Shiming
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\waybill-management\\services\\waybill-management.service.ts
@@ -49,10 +49,12 @@ export class WaybillManagementServe extends BaseService {
   // 查询CRM客户信息表
   $api_get_crmCustomer_page = '/api/mdc/cuc/crmCustomer/list/page';
 
-  // 查询运营端未回复异常上报
+  // 查询运营端异常上报
-  $api_get_listOperatePage = '/api/sdc/exceptionReport/listOperateUnReplyPage';
+  $api_get_listOperatePage = '/api/sdc/exceptionReport/listOperatePage';
-  // 查询运营端已回复异常上报
+  // 查询运营端异常上报数据统计
-  $api_get_listOperateReplyPage = '/api/sdc/exceptionReport/listOperateReplyPage';
+  $api_get_listOperateStatus = '/api/sdc/exceptionReport/listOperateStatus';
+  // // 查询运营端已回复异常上报
+  // $api_get_listOperateReplyPage = '/api/sdc/exceptionReport/listOperateReplyPage';
  // 获取轨迹
  $api_get_getTrajectory = `/api/sdc/billShipper/getTrajectoryByBillId`;
  //  获取订单司机轨迹