diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index 9eca7624..235faf6f 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -20,7 +20,7 @@ export class SupplyManagementBulkDetailComponent implements OnInit { logColumns: STColumn[] = [ { title: '内容', index: 'operationContent' }, { title: '操作人', index: 'operator' }, - { title: '操作时间', index: ' operatorTimestamp' }, + { title: '操作时间', index: 'operatorTimestamp' }, ]; driverColums: STColumn[] = [ { title: '司机姓名', index: 'theme' }, diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 8d79823d..28c6636e 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -212,6 +212,10 @@ - + + diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts index b70c8827..ce6a9c05 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts @@ -17,15 +17,15 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { id = this.route.snapshot.params.id; i: any; - logColumns: STColumn[] = [ - { title: '内容', index: 'theme' }, - { title: '操作人', index: 'operationUserPhone' }, - { title: '操作时间', index: ' createTime' }, - ]; serviceType: any = { 1: '抢单', 2: '指派' } + logColumns: STColumn[] = [ + { title: '内容', index: 'operationContent' }, + { title: '操作人', index: 'operator' }, + { title: '操作时间', index: 'operatorTimestamp' }, + ]; totalObj: any; attObj: any; status: any = { 1: '待接单', 2: '已接单', 3: '已取消' }; @@ -50,11 +50,16 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { render: 'price' }, ]; - + get reqParams() { + return { + operateObject: this.i?.resourceCode, + operateType: 4, + }; + } constructor( private route: ActivatedRoute, private msgSrv: NzMessageService, - private service: SupplyManagementService, + public service: SupplyManagementService, public modal: NzModalService, public router: Router ) { diff --git a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts index f5e23a68..ec676d98 100644 --- a/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts +++ b/src/app/routes/sys-setting/components/network-freight/network-freight.component.ts @@ -244,12 +244,12 @@ export class NetworkFreightComponent implements OnInit { ui: { placeholder: '请输入' } }, invoiceTaxRate: { - type: 'string', + type: 'number', title: '发票税率', ui: { placeholder: '请输入' } }, invoiceMaxAmount: { - type: 'string', + type: 'number', title: '发票面额上限', ui: { placeholder: '请输入' } }, @@ -366,7 +366,7 @@ export class NetworkFreightComponent implements OnInit { ui: { placeholder: '请输入' } }, invoiceTaxRate: { - type: 'string', + type: 'number', title: '发票税率', ui: { placeholder: '请输入' } },