diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index eceae53e..a4195012 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -241,8 +241,13 @@ [page]="{ show: false, showSize: false }"> - - + + + {{item?.operator}}/{{item.telephone}} + + diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index c2598a65..8fc20b1d 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 15:53:43 + * @LastEditTime : 2022-04-13 18:51:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -45,6 +45,11 @@ export class OrderManagementBulkeDetailComponent implements OnInit { { title: '时间', index: 'warningTime' }, { title: '异常预警类型', index: 'warningTypeLabel' } ]; + operateLogColums: STColumn[] = [ + { title: '内容', index: 'operationContent' }, + { title: '操作人', render: 'operator' }, + { title: '操作时间', index: 'operatorTimestamp' }, + ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, { title: '小计(元)', render: 'prices' }, @@ -65,6 +70,9 @@ export class OrderManagementBulkeDetailComponent implements OnInit { } } ]; + get logParams() { + return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } + } trajectory = 'car'; mapList: any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 658fb561..ad1d29a0 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -247,7 +247,13 @@ [page]="{ show: false, showSize: false }"> - + + + {{item?.operator}}/{{item.telephone}} + + diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index f15f9bde..3992467e 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-13 15:55:47 + * @LastEditTime : 2022-04-13 18:51:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -51,6 +51,11 @@ export class OrderManagementVehicleDetailComponent implements OnInit { { title: '时间', index: 'warningTime' }, { title: '异常预警类型', index: 'warningTypeLabel' } ]; + operateLogColums: STColumn[] = [ + { title: '内容', index: 'operationContent' }, + { title: '操作人', render: 'operator' }, + { title: '操作时间', index: 'operatorTimestamp' }, + ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, { title: '小计(元)', render: 'prices' }, @@ -63,6 +68,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit { index: 'paymentStatusLabel' } ]; + get logParams() { + return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } + } constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index c63771cd..f8cd497c 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/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-04-11 22:29:34 + * @LastEditTime : 2022-04-13 18:52:24 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -204,6 +204,8 @@ export class OrderManagementService extends ShipperBaseService { $api_abnormalWarning_asyncExport = `/api/sdc/abnormalWarning/asyncExport`; // 异步导出投诉管理导出 $api_asyncExportComplaintListDrv = `/api/sdc/complaint/operate/asyncExportComplaintListDrv`; + //操作日志 + public $api_get_log_list = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`; /** * 根据企业ID,获取企业历史网络货运人 * @returns diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index 2cf91aeb..424f8f6f 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -261,7 +261,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { { title: '卸货地详细地址', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' }, { title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' }, { title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' }, - { title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' }, + { title: '录单时间', index: 'recordTime', className: 'text-center', width: '250px' }, { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' }, { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' },