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

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

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2022-01-05 15:37:53
+ * @LastEditTime: 2022-01-12 10:19:05
  * @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\supply-management\components\bulk\bulk.component.html
@@ -86,14 +86,13 @@
           (<span [ngStyle]="{ color:item?.count>0?'#1890FF':''}">{{item?.count}}</span>)
         </div>
       </ng-template>
+      <ng-template st-row="goodsInfos" let-item let-index="index">
+        <div>{{item?.goodsInfos?.goodsName}}</div>
+        <div>货源：{{item?.goodsInfos?.goodsResource}}</div>
+      </ng-template>
       <ng-template st-row="useCarDemand" let-item let-index="index">
         <div>车型: {{item.carModelLabel}}</div>
         <div class="error">车长: {{item.expand}} 米</div>
-      </ng-template>     
-       <ng-template st-row="goodsInfo" let-item let-index="index">
-        <div>{{item.owner}}</div>
-        <div>货源：{{item.progress}} 顿 / {{item.progress}} 方</div>
-        <div class="error">剩余: {{item.progress}} 顿 / {{item.progress}} 方</div>
       </ng-template>     
       <ng-template st-row="demand" let-item let-index="index">
         <div>车型: {{item.progress}}</div>

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

@@ -547,9 +547,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
         .subscribe(res => {
           this.sf1.getProperty('/enterpriseProjectId')!.schema.enum = res;
           this.sf1.getProperty('/enterpriseProjectId')!.widget.reset(res);
-          console.log('12345645454545454=============');
-          console.log(this.enterpriseProjectIds);
-          console.log(res);
           if (this.enterpriseProjectIds) {
             this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
           }

src/app/routes/usercenter/components/freight/user/user.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-13 10:47:28
- * @LastEditTime: 2021-12-13 11:24:23
+ * @LastEditTime: 2022-01-12 09:58:12
  * @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\usercenter\components\freight\user\user.component.html

src/app/routes/usercenter/components/freight/user/user.component.ts

@@ -153,13 +153,14 @@ export class FreightComponentsUserComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        stateLocked: {
+        certificationStatus: {
           type: 'string',
           title: '状态',
           enum: [
             { label: '全部', value: '' },
-            { label: '正常', value: 0 },
+            { label: '待审核', value: 0 },
-            { label: '冻结', value: 1 }
+            { label: '正常', value: 1 },
+            { label: '冻结', value: 2 }
           ],
           default: '',
           ui: {

src/app/routes/vehicle/components/audit/audit.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-16 13:34:20
+ * @LastEditTime: 2022-01-12 09:43:19
  * @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\usercenter\components\freight\list\list.component.html
@@ -47,7 +47,13 @@
 <nz-card>
   <!-- 数据列表 -->
   <!-- [data]="service.$api_get_supplier_page" -->
-
+  <nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
+  <nz-tab [nzTitle]="'全部'"></nz-tab>
+  <nz-tab [nzTitle]="'待审核'"></nz-tab>
+  <nz-tab [nzTitle]="'未提交'"></nz-tab>
+  <nz-tab [nzTitle]="'审核通过'"></nz-tab>
+  <nz-tab [nzTitle]="'驳回'"></nz-tab>
+</nz-tabset>
   <st
     #st
     [bordered]="true"
@@ -62,7 +68,7 @@
     <div>{{item?.carModelLabel}}-{{item?.carLength?  item?.carLength + '米' : ''}}-{{ item?.carLoad? item?.carLoad + '吨' : ''}}</div>
     </ng-template>
     <ng-template st-row="isSelf" let-item let-index="index">
-    <div>{{item?.carModelLabel}}-{{item?.carLength?  item?.carLength + '米' : ''}}-{{ item?.carLoad? item?.carLoad + '吨' : ''}}</div>
+    <div >{{item?.isSelf ? '是' : '否'}}</div>
     </ng-template>
     <ng-template st-row="contactsPhone" let-item let-index="index">
         <div

src/app/routes/vehicle/components/audit/audit.component.ts

@@ -12,8 +12,7 @@ import { VehicleService } from '../../../vehicle/services/vehicle.service';
 })
 export class VehicleComponentsAuditComponent implements OnInit {
   _$expand = false;
-  url = `/rule?_allow_anonymous=true`;
+  resourceStatus: any;
-
   ui!: SFUISchema;
   schema!: SFSchema;
   columns!: STColumn[];
@@ -32,16 +31,21 @@ export class VehicleComponentsAuditComponent implements OnInit {
    * 查询参数
    */
   get reqParams() {
-    const params: any = {
+    const a:any = {};
-      ...(this.sf && this.sf.value),
+    console.log(this.resourceStatus)
-    };
+    if(this.resourceStatus === 1) {
-    if (this.sf?.value.effectiveDate) {
+      a.approvalStatus = 10
-      params.effectiveDateStart = this.sf?.value.effectiveDate[0];
+    } else if(this.resourceStatus === 2) {
-      params.effectiveDateEnd = this.sf?.value.effectiveDate[1];
+      a.approvalStatus = -1
+    } else if(this.resourceStatus === 3) {
+      a.approvalStatus = 20
+    } else if(this.resourceStatus === 4) {
+      a.approvalStatus = 30
     }
-    delete params.effectiveDate;
+    return {
-    delete params.expand;
+      ...a,
-    return params;
+      ...this.sf?.value,
+    };
   }
 
   get selectedRows() {
@@ -153,7 +157,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
     this.columns = [
       // { title: '', type: 'checkbox', className: 'text-center' },
       { title: '车牌号', className: 'text-center', index: 'carNo' },
-      { title: '车牌颜色', className: 'text-center', index: 'carModelLabel' },
+      { title: '车牌颜色', className: 'text-center', index: 'carNoColorLabel' },
       { title: '车型-车长-载重', className: 'text-center', render: 'carLength' },
       { title: '是否挂靠', className: 'text-center', render: 'isSelf' },
       { title: '所有人', className: 'text-center', index: 'carOwner' },
@@ -166,13 +170,14 @@ export class VehicleComponentsAuditComponent implements OnInit {
         badge: {
           '-1': { text: '未上传', color: 'default' },
           0: { text: '草稿', color: 'warning' },
+          15: { text: '已撤销', color: 'warning' },
           10: { text: '待审核', color: 'warning' },
           20: { text: '已审核', color: 'success' },
           30: { text: '已驳回', color: 'error' },
           40: { text: '证件过期', color: 'error' },
         },
       },
-      { title: '申请时间', className: 'text-center', render: 'isSelf' },
+      { title: '申请时间', className: 'text-center', index: 'createTime' },
       {
         title: '操作',
         width: '170px',
@@ -189,6 +194,16 @@ export class VehicleComponentsAuditComponent implements OnInit {
       },
     ];
   }
+  selectChange(e: number) {
+    console.log(e);
+    if(e>=1) {
+    this.resourceStatus = e;
+    }
+    this.initST();
+    setTimeout(() => {
+      this.st.load();
+    }, 500);
+  }
   daoyun(item: any) {
     this.router.navigate(['./view', item], { relativeTo: this.ar });
   }

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

@@ -1,20 +1,27 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-24 15:38:08
- * @LastEditTime: 2022-01-10 21:03:37
+ * @LastEditTime: 2022-01-11 19:47: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\sys-setting\components\crm-management\crm-management.component.html
 -->
-<page-header-wrapper title="异常上报">
+<page-header-wrapper title="异常上报"> </page-header-wrapper>
-</page-header-wrapper>
 
-<nz-card >
+<nz-card>
   <div nz-row nzGutter="8">
     <!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
     <div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
-          <sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
+      <sf
-            (formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
+        #sf
+        [schema]="schema"
+        [ui]="ui"
+        [mode]="'search'"
+        [disabled]="!sf?.valid"
+        [loading]="service.http.loading"
+        (formSubmit)="search()"
+        (formReset)="resetSF()"
+      ></sf>
     </div>
 
     <!-- 查询字段大于3个时，根据展开状态调整布局 -->
@@ -23,10 +30,7 @@
         <sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
       </div>
       <div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
-            <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
+        <button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading" (click)="search()">查询</button>
-              (click)="st?.load(1)">查询</button>
-            <button nz-button nzType="primary" 
-             >导出</button>
         <button nz-button (click)="resetSF()">重置</button>
         <button nz-button nzType="link" (click)="expandToggle()">
           {{ !_$expand ? '展开' : '收起' }}
@@ -38,14 +42,18 @@
 </nz-card>
 
 <nz-card class="content-box">
-
+  <nz-tabset [(nzSelectedIndex)]="selectedIndex">
-  <nz-tabset>
+    <nz-tab nzTitle="待回复">
-    <nz-tab nzTitle="费用明细">
+      <st
-      <st #st [data]="service.$api_get_crmCustomer_page" [columns]="columns"
+        #st
+        [data]="service.$api_get_listOperatePage"
+        [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)">
+        [loading]="service.http.loading"
+        [scroll]="{ y: '370px' }"
+      >
         <ng-template st-row="customerType" let-item let-index="index">
           <div>
             <span *ngIf="item?.customerType == 1">客户</span>
@@ -54,12 +62,17 @@
         </ng-template>
       </st>
     </nz-tab>
-    <nz-tab nzTitle="开票信息">
+    <nz-tab nzTitle="已回复">
-      <st #st [data]="service.$api_get_crmCustomer_page" [columns]="columns"
+      <st
+        #st2
+        [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' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-      [loading]="service.http.loading" [scroll]="{ y: '370px' }" (change)="stChange($event)">
+        [loading]="service.http.loading"
+        [scroll]="{ y: '370px' }"
+      >
         <ng-template st-row="customerType" let-item let-index="index">
           <div>
             <span *ngIf="item?.customerType == 1">客户</span>

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

@@ -1,7 +1,10 @@
 import { Component, OnInit, ViewChild, Type } from '@angular/core';
 import { STComponent, STColumn, STChange } from '@delon/abc/st';
-import { SFComponent, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
+import { ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
+import { of } from 'rxjs';
+import { map } from 'rxjs/operators';
 import { WaybillManagementServe } from '../../services/waybill-management.service';
 
 @Component({
@@ -12,8 +15,9 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic
 export class WaybillManagementAbnormalAppearComponent implements OnInit {
   @ViewChild('st', { static: true })
   st!: STComponent;
+  @ViewChild('st2', { static: true })
+  st2!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
-  @ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
   ui: SFUISchema = {};
   ui2: SFUISchema = {};
   schema: SFSchema = {};
@@ -24,43 +28,53 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
   isVisible = false;
   edit = false;
   editId = false;
+  selectedIndex = 0;
 
   columns: STColumn[] = [
-    { title: '异常编号', index: 'customerName' },
+    { title: '异常编号', index: 'exceptionCode',width: '180px' },
-    { title: '关联运单号', index: 'customerName' },
+    { title: '关联运单号', index: 'wayBillCode',width: '180px' },
-    { title: '网络货运人', index: 'customerName' },
+    { title: '网络货运人', index: 'enterpriseInfoName',width: '180px' },
-    { title: '货主', index: 'customerName' },
+    { title: '货主', index: 'shipperAppUserName' ,width: '180px'},
-    { title: '装货地', index: 'customerName' },
+    { title: '装货地', index: 'loadingPlace' ,width: '180px'},
-    { title: '卸货地', index: 'customerName' },
+    { title: '卸货地', index: 'dischargePlace' ,width: '180px'},
-    { title: '承运司机', index: 'customerName' },
+    { title: '承运司机', index: 'driver' ,width: '90px'},
-    { title: '异常信息', index: 'customerName' },
+    { title: '异常信息', index: 'exceptionContent',width: '250px' },
-    { title: '异常图片', index: 'customerName' },
+    { title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '220px'},
-    { title: '上报时间', index: 'customerName' },
+    { title: '上报时间', index: 'createTime',width: '180px' },
+  ];
+  columns2: STColumn[] = [
+    { title: '异常编号', index: 'exceptionCode',width: '180px' },
+    { title: '关联运单号', index: 'wayBillCode',width: '180px' },
+    { title: '网络货运人', index: 'enterpriseInfoName',width: '180px' },
+    { title: '货主', index: 'shipperAppUserName' ,width: '180px'},
+    { title: '装货地', index: 'loadingPlace' ,width: '180px'},
+    { title: '卸货地', index: 'dischargePlace' ,width: '180px'},
+    { title: '承运司机', index: 'driver' ,width: '90px'},
+    { title: '异常信息', index: 'exceptionContent',width: '250px' },
+    { title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '220px'},
+    { title: '上报时间', index: 'createTime',width: '180px' },
   ];
-
-  selectedRows: any[] = [];
 
   get reqParams (){ 
     return {
     ...this.sf?.value,
   }};
+  get reqParams2 (){ 
+    return {
+    ...this.sf?.value,
+  }};
 
-  constructor(public service: WaybillManagementServe, private nzModalService: NzModalService) {}
+  constructor(
+    public service: WaybillManagementServe,
+    private nzModalService: NzModalService,
+    public shipperSrv: ShipperBaseService
+
+     ) {}
 
   ngOnInit(): void {
     this.initSF()
   }
 
-  stChange(e: STChange): void {
-    switch (e.type) {
-      case 'checkbox':
-        this.selectedRows = e.checkbox!;
-        break;
-      case 'filter':
-        this.st.load();
-        break;
-    }
-  }
   /**
   * 伸缩查询条件
   */
@@ -78,47 +92,143 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
   this.schema = {
     properties: {
       _$expand: { type: 'boolean', ui: { hidden: true } },
-      customerName: {
+      exceptionCode: {
         type: 'string',
-        title: '运单编号',
+        title: '异常编号',
         ui: { placeholder: '请输入' }
       },
-      customerShortName: {
+      wayBillCode: {
         type: 'string',
-        title: '司机',
+        title: '运单号',
         ui: { placeholder: '请输入' }
       },
-      customerCode: {
+      exceptionType: {
         type: 'string',
         title: '异常类型',
-        ui: { placeholder: '请输入',
+        ui: { placeholder: '请输入' }
+      },
+      shipperAppUserId: {
+        type: 'string',
+        title: '货主',
+        ui: {
+          widget: 'select',
+          serverSearch: true,
+          searchDebounceTime: 300,
+          searchLoadingText: '搜索中...',
+          onSearch: (q: any) => {
+            console.log(q)
+            if (!!q) {
+              return this.service
+                .request(this.service.$api_enterpriceList, { enterpriseName: q})
+                .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
+                .toPromise();
+            } else {
+              return of([]);
             }
           },
+          visibleIf: {
+            _$expand: (value: boolean) => value,
+          },
+        } as SFSelectWidgetSchema,
+      },
+      enterpriseProjectId: {
+        type: 'string',
+        title: '所属项目',
+        ui: {
+          widget: 'select',
+          visibleIf: {
+            _$expand: (value: boolean) => value,
+          },
+          asyncData: () =>
+            this.shipperSrv.getEnterpriseProject()
+        } as SFSelectWidgetSchema,
+      },
+      driverId: {
+        title: '承运司机',
+        type: 'string',
+        ui: {
+          widget: 'select',
+          serverSearch: true,
+          searchDebounceTime: 300,
+          searchLoadingText: '搜索中...',
+          onSearch: (q: any) => {
+            if (!!q) {
+              return this.service
+                .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
+                .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
+                .toPromise();
+            } else {
+              return of([]);
+            }
+          },
+          visibleIf: {
+            _$expand: (value: boolean) => value
+          }
+        } as SFSelectWidgetSchema
+      },
+      customerCode: {
+        title: '车牌号',
+          type: 'string',
+          ui: {
+            widget: 'select',
+            serverSearch: true,
+            searchDebounceTime: 300,
+            searchLoadingText: '搜索中...',
+            onSearch: (q: any) => {
+              if (!!q) {
+                return this.service
+                  .request(this.service.$api_get_getCarLicenseListByCarNo, {
+                    carNo: q
+                  })
+                  .pipe(map((res: any[]) => (res as any[]).map((i) => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
+                  .toPromise();
+              } else {
+                return of([]);
+              }
+            },
+            visibleIf: {
+              _$expand: (value: boolean) => value,
+            },
+          } as SFSelectWidgetSchema,
+      },
+      reportingTime: {
+        title: '上报时间',
+        type: 'string',
+        ui: {
+          widget: 'date',
+          mode: 'range',
+          format: 'yyyy-MM-dd',
+          visibleIf: {
+            _$expand: (value: boolean) => value
+          }
+        } as SFDateWidgetSchema
+      },
+      enterpriseInfoId: {
+        type: 'string',
+        title: '网络货运人',
+        ui: {
+          widget: 'select',
+          placeholder: '请选择',
+          visibleIf: {
+            _$expand: (value: boolean) => value,
+          },
+          allowClear: true,
+          asyncData: () => this.shipperSrv.getNetworkFreightForwarder(),
+      },
+    }
   }
-    
   };
   this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
 
-  roleAction(value: any,item?: any) {
+  search() {
-  
+    console.log(this.selectedIndex)
-      // this.service.request(this.service.$api_get_crmCustomer, {id: value.id}).subscribe((res: any) => {
+    if(this.selectedIndex === 0) {
-      //   console.log(res)
+        this.st?.load(1)
-      //   if(res) {
+    } else {
-      //     this.formData = res;
+        this.st2?.load(1)
-      //   }
-      // })
     }
-
-  deleteAction(item?: any) {
-    this.nzModalService.error({
-      nzTitle: '确认删除？',
-      nzClosable: false,
-      nzCancelText: '取消',
-      nzOnOk: () => {}
-    });
   }
-
   /**
    * 重置表单
    */

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-01-05 20:36:38
+ * @LastEditTime: 2022-01-11 19:07:29
  * @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\waybill-management\services\waybill-management.service.ts
@@ -51,6 +51,12 @@ export class WaybillManagementServe extends BaseService {
 
      // 查询CRM客户信息表
   $api_get_crmCustomer_page = '/api/mdc/cuc/crmCustomer/list/page';
+
+     // 查询运营端异常上报
+  $api_get_listOperatePage = '/api/sdc/exceptionReport/listOperateUnReplyPage';
+
+    // 获取货主企业列表
+    public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
   constructor(public injector: Injector) {
     super(injector)
   }