diff --git a/proxy.conf.js b/proxy.conf.js index 10071e14..67c15ee2 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -20,7 +20,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-dev.eascs.com', + host: 'tms-api-test.eascs.com', protocol: 'https:', port: 443 }, diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index e55d1e52..e3ac3ddb 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -28,7 +28,7 @@ + [page]="{ show: true, showSize: true, pageSizes: [10,20, 50, 100] }" [loading]="service.http.loading"> {{item?.billStatusLabel}} {{item?.billStatusLabel}} @@ -42,6 +42,13 @@
{{item?.amount | currency :' '}}
+ + + 查看轨迹 + + + 查看轨迹 +
diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index ff637830..2491ad82 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -267,7 +267,7 @@ export class DatatableOrderReportingComponent implements OnInit { { title: '订单状态', render: 'orderStatus', className: 'text-center', width: '120px', }, { title: '司机状态', render: 'driverStatus', className: 'text-center', width: '120px', }, { title: '车辆状态', render: 'carStatus', className: 'text-center', width: '120px', }, - { title: '本地校验66', render: 'localValid', className: 'text-center', width: '120px', }, + { title: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, { title: '订单号', render: 'billComplianceVOS', @@ -285,12 +285,12 @@ export class DatatableOrderReportingComponent implements OnInit { { title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, { title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '120px' }, { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '180px' }, - { title: '发货时间', render: 'driver', className: 'text-center', width: '180px' }, + { title: '发货时间', render: 'driver2', className: 'text-center', width: '180px' }, { title: '收货时间', render: 'payeeName', className: 'text-center', width: '180px' }, { title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' }, { title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '200px' }, { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '200px' }, - { title: '收货方名称', render: 'driver', className: 'text-center', width: '150px' }, + { title: '收货方名称', render: 'driver1', className: 'text-center', width: '150px' }, { title: '收货地址', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '运费金额', render: 'amount', className: 'text-center', width: '250px' }, { title: '车牌号', render: 'payeeName', className: 'text-center', width: '150px' }, @@ -302,8 +302,8 @@ export class DatatableOrderReportingComponent implements OnInit { { title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' }, { title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '200px' }, { title: '实际承运人道路运输许可证号', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '车辆轨迹', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '司机轨迹', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' }, + { title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' }, { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' }, { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, ]; diff --git a/src/app/routes/download/components/list/list.component.ts b/src/app/routes/download/components/list/list.component.ts index 00b3626b..05f38c4c 100644 --- a/src/app/routes/download/components/list/list.component.ts +++ b/src/app/routes/download/components/list/list.component.ts @@ -8,7 +8,7 @@ import { DownloadService } from '../../services/download.service'; @Component({ selector: 'app-download-center-components-list', - templateUrl: './list.component.html', + templateUrl: './list.component.html' }) export class DownloadComponentsListComponent implements OnInit { ui: SFUISchema = {}; @@ -24,7 +24,7 @@ export class DownloadComponentsListComponent implements OnInit { get reqParams() { const params = Object.assign({}, this.sf?.value || {}); delete params._$expand; - return { ...params }; + return { ...params, createTime: params?.createTime?.start, applyEndTime: params?.createTime?.end }; } /** @@ -49,23 +49,18 @@ export class DownloadComponentsListComponent implements OnInit { properties: { _$expand: { type: 'boolean', - ui: { hidden: true }, + ui: { hidden: true } }, - applyStartTime: { + createTime: { type: 'string', title: '创建时间', ui: { - widget: 'date', - format: 'yyyy-MM-dd', - end: 'applyEndTime', - } as SFDateWidgetSchema, - }, - applyEndTime: { - type: 'string', - title: '', - ui: { widget: 'date', end: 'end' } as SFDateWidgetSchema, - }, - }, + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema + } + } }; this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 } } }; } @@ -87,8 +82,8 @@ export class DownloadComponentsListComponent implements OnInit { enum: { 0: '生成中', 1: '已完成', - 2: '失败', - }, + 2: '失败' + } }, { title: '下载次数', index: 'downloadCount', width: '120px', className: 'text-center' }, { title: '创建时间', index: 'createTime', width: '120px', className: 'text-center' }, @@ -98,10 +93,8 @@ export class DownloadComponentsListComponent implements OnInit { fixed: 'right', width: '170px', className: 'text-center', - buttons: [ - { text: '下载', click: (_record) => this.download(_record)}, - ], - }, + buttons: [{ text: '下载', click: _record => this.download(_record) }] + } ]; } @@ -115,12 +108,12 @@ export class DownloadComponentsListComponent implements OnInit { nzTitle: '删除确认', nzContent: `即将删除 当前行数据,请仔细核对,避免误操作!
是否删除?
`, nzOnOk: () => - this.service.request(this.service.encodeUrlHeader(this.service.$api_del_many, headers), { fileKey: record.id }).subscribe((res) => { + this.service.request(this.service.encodeUrlHeader(this.service.$api_del_many, headers), { fileKey: record.id }).subscribe(res => { if (res) { this.service.msgSrv.success('数据删除成功!'); this.st?.reload(); } - }), + }) }); } download(record: STData) { @@ -129,7 +122,7 @@ export class DownloadComponentsListComponent implements OnInit { this.service.encodeUrlHeader(this.service.$api_download_file, headers), {}, { fileKey: record.fileUniqueKey }, - 'POST', + 'POST' ); } } diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html index 80d1837f..04fdad70 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.html @@ -12,7 +12,7 @@
- + - +
diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html index 14f0808f..2d05f3d4 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html @@ -83,7 +83,7 @@ class="text-right"> - + - +