From de78398c54a2d15112d34c042bae711c815f6c0e Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Fri, 6 May 2022 16:22:15 +0800 Subject: [PATCH] UI --- .../fund-reporting.component.html | 51 +++-- .../fund-reporting.component.ts | 160 ++++---------- .../order-reporting.component.html | 68 +++--- .../order-reporting.component.less | 5 - .../order-reporting.component.spec.ts | 24 -- .../order-reporting.component.ts | 205 ++++++------------ .../reporting/services/reporting.service.ts | 4 +- .../routes/datatable/services/data.service.ts | 6 +- .../individual-collect.component.html | 2 +- .../invoice-reporting.component.less | 22 -- .../order-reporting.component.ts | 5 +- 11 files changed, 183 insertions(+), 369 deletions(-) delete mode 100644 src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.less delete mode 100644 src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.spec.ts delete mode 100644 src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html index e13fbf66..d9065fb2 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html @@ -1,7 +1,5 @@ - - +
@@ -17,18 +15,19 @@
- - - + --> + +
+ + + + + +
- - - - + {{item?.uploadStatusLabel}} @@ -52,14 +51,28 @@ -
+
已选择 {{ selectedRows.length }} 条数据
- - - + + + + +
    +
  • + 上传 +
    • +
  • + 撤回 +
    • +
  • + 更新数据 +
    • +
+
- + \ No newline at end of file diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index 55fb8aa8..aec9bfeb 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -1,24 +1,21 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; -import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; -import { ShipperBaseService } from '@shared'; +import { SFDateWidgetSchema } from '@delon/form'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { ReportingService } from '../../services/reporting.service'; import { DatatableReportingFundInfoComponent } from '../fund-info/fund-info.component'; @Component({ selector: 'app-datatable-fund-reporting', templateUrl: './fund-reporting.component.html', - styleUrls: ['./fund-reporting.component.less'] + styleUrls: ['../../../../commom/less/commom-table.less'] }) -export class DatatableFundReportingComponent implements OnInit { - _$expand = false; - ui!: SFUISchema; - schema!: SFSchema; +export class DatatableFundReportingComponent extends BasicTableComponent implements OnInit { columns!: STColumn[]; @ViewChild('st', { static: false }) st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; tabType!: string; tabs: any[] = [ { name: '待上传', value: '1' }, @@ -36,15 +33,9 @@ export class DatatableFundReportingComponent implements OnInit { private router: Router, private ar: ActivatedRoute, private modal: NzModalService, - public shipperSrv: ShipperBaseService + public searchDrawerService: SearchDrawerService ) { - } - - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; + super(searchDrawerService); } /** @@ -65,22 +56,6 @@ export class DatatableFundReportingComponent implements OnInit { // return this.st?.list.filter((item: any) => item.checked) || []; // } - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - this.isLoading = true - } /** * 程序初始化入口 */ @@ -95,29 +70,26 @@ export class DatatableFundReportingComponent implements OnInit { initSF() { this.schema = { properties: { - _$expand: { type: 'boolean', ui: { hidden: true } }, orderCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } }, wayBillCode: { type: 'string', title: '运单号', ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, serialNumberCode: { type: 'string', title: '流水单号', ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, carrier: { title: '承运司机', type: 'string', ui: { - placeholder: '请输入司机姓名', visibleIf: { - _$expand: (value: boolean) => value, - }, + placeholder: '请输入司机姓名' } }, carNumber: { @@ -125,10 +97,7 @@ export class DatatableFundReportingComponent implements OnInit { type: 'string', maxLength: 9, ui: { - placeholder: '请输入', - visibleIf: { - _$expand: (value: boolean) => value, - }, + placeholder: '请输入' } }, payee: { @@ -136,10 +105,7 @@ export class DatatableFundReportingComponent implements OnInit { type: 'string', maxLength: 9, ui: { - placeholder: '请输入', - visibleIf: { - _$expand: (value: boolean) => value, - }, + placeholder: '请输入' } }, // uploadStatus: { @@ -170,10 +136,7 @@ export class DatatableFundReportingComponent implements OnInit { ui: { placeholder: '请选择', allowClear: true, - widget: 'select', - visibleIf: { - _$expand: (value: boolean) => value, - }, + widget: 'select' } }, ltdId: { @@ -182,10 +145,7 @@ export class DatatableFundReportingComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', - asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), - visibleIf: { - _$expand: (value: boolean) => value, - }, + asyncData: () => this.service.getNetworkFreightForwarder({}, false), allowClear: true } }, @@ -195,11 +155,8 @@ export class DatatableFundReportingComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema }, uploadTime: { title: '上传时间', @@ -207,17 +164,10 @@ export class DatatableFundReportingComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, - }, - }, - }; - this.ui = { - '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, - $time: { grid: { span: 24 } }, + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema + } + } }; } @@ -226,22 +176,22 @@ export class DatatableFundReportingComponent implements OnInit { */ initST() { this.columns = [ - { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '上传状态', render: 'uploadStatus', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'verifyStatus', className: 'text-center', width: '120px', }, - { title: '流水单号', index: 'serialNumberCode', className: 'text-center', width: '190px', }, + { title: '', type: 'checkbox', className: 'text-center', width: '60px' }, + { title: '上传状态', render: 'uploadStatus', className: 'text-center', width: '120px' }, + { title: '本地校验', render: 'verifyStatus', className: 'text-center', width: '120px' }, + { title: '流水单号', index: 'serialNumberCode', className: 'text-center', width: '190px' }, { title: '订单号', render: 'orderCode', className: 'text-center', - width: '180px', + width: '180px' }, - { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '180px', }, + { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '180px' }, { title: '网络货运人', index: 'ltdName', className: 'text-center', - width: '180px', + width: '180px' }, { title: '实际承运人名称', index: 'carrier', className: 'text-center', width: '150px' }, { title: '实际承运人证件号码', index: 'cardId', className: 'text-center', width: '200px' }, @@ -259,12 +209,10 @@ export class DatatableFundReportingComponent implements OnInit { { title: '实际支付金额', render: 'payAmount', className: 'text-center', width: '150px' }, { title: '交易时间', index: 'transactionTime', className: 'text-center', width: '180px' }, { title: '上传次数', index: 'uploadFrequency', className: 'text-center', width: '120px' }, - { title: '上传时间', index: 'uploadTime', className: 'text-center', width: '180px' }, + { title: '上传时间', index: 'uploadTime', className: 'text-center', width: '180px' } ]; } - - /** *撤销 * @param record 记录实例 @@ -287,11 +235,9 @@ export class DatatableFundReportingComponent implements OnInit { this.search(); } - }) + }); } }); - - } selectChange(item: any) { @@ -300,7 +246,7 @@ export class DatatableFundReportingComponent implements OnInit { setTimeout(() => { this.selectedRows = []; this.st.load(1); - }) + }); } /** @@ -310,7 +256,7 @@ export class DatatableFundReportingComponent implements OnInit { // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); this.router.navigate(['../detail'], { queryParams: { - id: record.id, + id: record.id }, relativeTo: this.ar }); @@ -348,12 +294,9 @@ export class DatatableFundReportingComponent implements OnInit { this.service.msgSrv.success('上传成功'); this.search(); } - }) + }); } - - - /** * 查看校验结果 */ @@ -368,12 +311,9 @@ export class DatatableFundReportingComponent implements OnInit { }, nzFooter: null }); - modalRef.afterClose.subscribe(res => { - }) + modalRef.afterClose.subscribe(res => {}); } - - /** * 查看监管审核结果 */ @@ -381,7 +321,7 @@ export class DatatableFundReportingComponent implements OnInit { if (record?.verifyStatus !== '2') { return; } - this.openWainingModal('监管审核结果', record?.uploadResult) + this.openWainingModal('监管审核结果', record?.uploadResult); } /** @@ -398,20 +338,18 @@ export class DatatableFundReportingComponent implements OnInit { this.service.msgSrv.success('更新成功'); this.selectedRows = []; this.st.reload(); - } - }) + }); } - search() { this.selectedRows = []; this.st.load(1); } /** - * 异步导出 - */ + * 异步导出 + */ export() { this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_fund_reporting); } @@ -420,12 +358,11 @@ export class DatatableFundReportingComponent implements OnInit { this.modal.warning({ nzMask: false, nzTitle: title, - nzContent: content, - }) + nzContent: content + }); } changeSt(e: STChange): void { - if (e.type === 'checkbox') { const checkRows = (e.checkbox as STData[]) || []; //判断当前页是否有选中的行 @@ -434,16 +371,15 @@ export class DatatableFundReportingComponent implements OnInit { const stList = this.st.list; stList.forEach(item => { this.selectedRows = this.selectedRows.filter((e: any) => e.id !== item.id); - }) + }); } else { //添加新增的行 checkRows.forEach((item: any) => { const newSelectedList = this.selectedRows.filter((r: any) => r.id === item.id); if (newSelectedList.length === 0) { this.selectedRows.push(item); - } - }) + }); // 移除取消选中的行 const stList = this.st.list; stList.forEach(item => { @@ -451,12 +387,12 @@ export class DatatableFundReportingComponent implements OnInit { const index = this.selectedRows.findIndex(_item => item.id === _item.id); if (index !== -1) this.selectedRows.splice(index, 1); } - }) + }); } } else if (e.type === 'loaded') { // 页面加载时勾选 (e?.loaded || []).forEach((r: any) => { - this.selectedRows.forEach((x) => { + this.selectedRows.forEach(x => { if (x.id === r.id) { r.checked = true; } @@ -470,7 +406,7 @@ export class DatatableFundReportingComponent implements OnInit { window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`); } else if (item.orderType === '2') { window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`); - } else if (item.orderType === '3'){ + } else if (item.orderType === '3') { this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.orderId]); } } @@ -478,14 +414,10 @@ export class DatatableFundReportingComponent implements OnInit { routeTowaybill(item: any) { if (item.orderType === '1') { window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`); - } else if (item.orderType === '2') { window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.wayBillId}`); - } else if (item.orderType === '3') { window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`); } } - - } 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 1884a0ef..1047c728 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 @@ -1,17 +1,5 @@ - - - +
@@ -27,19 +15,19 @@
- - - + --> + +
+ + + + + +
- - - - + {{filterStatus(item?.billPutStatus)}} {{filterStatus(item?.billPutStatus)}} @@ -85,16 +73,32 @@ -
+
已选择 {{ selectedRows.length }} 条数据
- - - - + + + + +
    +
  • + 上传 +
    • +
  • + 撤回 +
    • +
  • + 更新数据 +
    • +
  • + 上传设置 +
    • +
+ +
- + \ No newline at end of file diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.less b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.less deleted file mode 100644 index 6009fbbf..00000000 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.less +++ /dev/null @@ -1,5 +0,0 @@ -:host { - .text-black { - color: #000; - } -} diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.spec.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.spec.ts deleted file mode 100644 index 2c07610f..00000000 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { DatatableOrderReportingComponent } from './order-reporting.component'; - -describe('DatatableOrderReportingComponent', () => { - let component: DatatableOrderReportingComponent; - let fixture: ComponentFixture; - - beforeEach(waitForAsync(() => { - TestBed.configureTestingModule({ - declarations: [ DatatableOrderReportingComponent ] - }) - .compileComponents(); - })); - - beforeEach(() => { - fixture = TestBed.createComponent(DatatableOrderReportingComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); 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 a01eefb1..67dc0496 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 @@ -2,8 +2,9 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; -import { ShipperBaseService } from '@shared'; +import { SearchDrawerService, ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; +import { BasicTableComponent } from 'src/app/routes/commom'; import { ReportingService } from '../../services/reporting.service'; import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @@ -12,15 +13,11 @@ import { DatatableReportingvViewTrackComponent } from '../view-track/view-track. @Component({ selector: 'app-datatable-order-reporting', templateUrl: './order-reporting.component.html', - styleUrls: ['./order-reporting.component.less'] + styleUrls: ['../../../../commom/less/commom-table.less'] }) -export class DatatableOrderReportingComponent implements OnInit { - _$expand = false; - ui!: SFUISchema; - schema!: SFSchema; +export class DatatableOrderReportingComponent extends BasicTableComponent implements OnInit { columns!: STColumn[]; @ViewChild('st', { static: false }) st!: STComponent; - @ViewChild('sf', { static: false }) sf!: SFComponent; tabType!: string; tabs: any[] = [ { name: '待上传', value: '0' }, @@ -37,15 +34,9 @@ export class DatatableOrderReportingComponent implements OnInit { private router: Router, private ar: ActivatedRoute, private modal: NzModalService, - public shipperSrv: ShipperBaseService + public searchDrawerService: SearchDrawerService ) { - } - - /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; + super(searchDrawerService); } /** @@ -53,7 +44,7 @@ export class DatatableOrderReportingComponent implements OnInit { */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - billPutStatus: this.selectedIndex, + billPutStatus: this.selectedIndex }); delete params._$expand; return { ...params }; @@ -66,22 +57,6 @@ export class DatatableOrderReportingComponent implements OnInit { // return this.st?.list.filter((item: any) => item.checked) || []; // } - /** - * 伸缩查询条件 - */ - expandToggle() { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - - /** - * 重置表单 - */ - resetSF() { - this.sf.reset(); - this._$expand = false; - this.isLoading = true - } /** * 程序初始化入口 */ @@ -102,8 +77,8 @@ export class DatatableOrderReportingComponent implements OnInit { type: 'string', title: '运单号', ui: { - placeholder: '请输入', - }, + placeholder: '请输入' + } }, networkTransporter: { title: '网络货运人', @@ -111,7 +86,7 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', - asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), + asyncData: () => this.service.getNetworkFreightForwarder({}, false), allowClear: true } }, @@ -119,19 +94,14 @@ export class DatatableOrderReportingComponent implements OnInit { title: '货主', type: 'string', ui: { - placeholder: '请输入', - visibleIf: { - _$expand: (value: boolean) => value, - }, + placeholder: '请输入' } }, driverName: { title: '承运司机', type: 'string', ui: { - placeholder: '请输入司机姓名/手机号', visibleIf: { - _$expand: (value: boolean) => value, - }, + placeholder: '请输入司机姓名/手机号' } }, carNo: { @@ -139,10 +109,7 @@ export class DatatableOrderReportingComponent implements OnInit { type: 'string', maxLength: 9, ui: { - placeholder: '请输入', - visibleIf: { - _$expand: (value: boolean) => value, - }, + placeholder: '请输入' } }, // putStatus: { @@ -175,10 +142,7 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { placeholder: '请选择', widget: 'select', - allowClear: true, - visibleIf: { - _$expand: (value: boolean) => value, - }, + allowClear: true } }, recentlyPutTime: { @@ -187,11 +151,8 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema }, orderReceivingTime: { title: '运单生成时间', @@ -199,11 +160,8 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema }, dispatchedDate: { title: '发货时间', @@ -211,11 +169,8 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema }, receivingDate: { title: '收货时间', @@ -223,11 +178,8 @@ export class DatatableOrderReportingComponent implements OnInit { ui: { widget: 'sl-from-to', type: 'date', - format: 'yyyy-MM-dd', - visibleIf: { - _$expand: (value: boolean) => value, - }, - } as SFDateWidgetSchema, + format: 'yyyy-MM-dd' + } as SFDateWidgetSchema }, trajectoryDataAppStatus: { @@ -240,10 +192,7 @@ export class DatatableOrderReportingComponent implements OnInit { ], ui: { placeholder: '请选择', - widget: 'select', - visibleIf: { - _$expand: (value: boolean) => value, - }, + widget: 'select' } }, trajectoryDataStatus: { @@ -256,22 +205,10 @@ export class DatatableOrderReportingComponent implements OnInit { ], ui: { placeholder: '请选择', - widget: 'select', - visibleIf: { - _$expand: (value: boolean) => value, - }, + widget: 'select' } - }, - }, - }; - this.ui = { - '*': { - spanLabelFixed: 120, - grid: { - lg: 12, - xl: 8 - }, enter: () => this.search() - }, + } + } }; } @@ -280,24 +217,24 @@ export class DatatableOrderReportingComponent implements OnInit { */ initST() { this.columns = [ - { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, - { title: '订单状态', index: 'billPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '司机状态', index: 'driverPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '车辆状态', index: 'carPutStatusLabel', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px', }, + { title: '', type: 'checkbox', className: 'text-center', width: '60px' }, + { title: '订单状态', index: 'billPutStatusLabel', className: 'text-center', width: '120px' }, + { title: '司机状态', index: 'driverPutStatusLabel', className: 'text-center', width: '120px' }, + { title: '车辆状态', index: 'carPutStatusLabel', className: 'text-center', width: '120px' }, + { title: '本地校验', render: 'checkStatus', className: 'text-center', width: '120px' }, { title: '订单号', render: 'billCode', className: 'text-center', - width: '180px', + width: '180px' }, - { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '180px', }, + { title: '运单号', render: 'wayBillCode', className: 'text-center', width: '180px' }, { title: '网络货运人', index: 'enterpriseInfoName', className: 'text-center', - width: '180px', + width: '180px' }, { title: '统一社会信用代码', index: 'unifiedSocialCreditCode', className: 'text-center', width: '200px' }, { title: '运单生成时间', index: 'wayBillCreateTime', className: 'text-center', width: '180px' }, @@ -317,12 +254,11 @@ export class DatatableOrderReportingComponent implements OnInit { width: '250px', type: 'enum', enum: { - "4": "绿色", - "3": "黄绿色", - "2": "黄色", - "1": "蓝色" + '4': '绿色', + '3': '黄绿色', + '2': '黄色', + '1': '蓝色' } - }, { title: '司机姓名', index: 'driverName', className: 'text-center', width: '150px' }, { title: '司机手机号码', index: 'driverPhone', className: 'text-center', width: '200px' }, @@ -330,18 +266,14 @@ export class DatatableOrderReportingComponent implements OnInit { { title: '货物信息', index: 'goodsName', className: 'text-center', width: '180px' }, { title: '实际承运人名称', index: 'carrierName', className: 'text-center', width: '150px' }, { title: '实际承运人证件号码', index: 'carrierIdentityNo', className: 'text-center', width: '200px' }, - - { title: '实际承运人道路运输许可证号', index: 'roadTransportNo', className: 'text-center', width: '150px' }, - + { title: '实际承运人道路运输许可证号', index: 'roadTransportNo', className: 'text-center', width: '230px' }, { title: '车辆轨迹', render: 'car', className: 'text-center', width: '250px' }, { title: '司机轨迹', render: 'driver', className: 'text-center', width: '150px' }, { title: '上传次数', index: 'putNumber', className: 'text-center', width: '150px' }, - { title: '上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' }, + { title: '上传时间', index: 'recentlyPutTime', className: 'text-center', width: '180px' } ]; } - - /** *撤销 * @param record 记录实例 @@ -363,14 +295,12 @@ export class DatatableOrderReportingComponent implements OnInit { this.service.msgSrv.success('撤销成功'); this.search(); } - }) + }); } }); - } changeSt(e: STChange): void { - if (e.type === 'checkbox') { const checkRows = (e.checkbox as STData[]) || []; //判断当前页是否有选中的行 @@ -379,16 +309,15 @@ export class DatatableOrderReportingComponent implements OnInit { const stList = this.st.list; stList.forEach(item => { this.selectedRows = this.selectedRows.filter((e: any) => e.id !== item.id); - }) + }); } else { //添加新增的行 checkRows.forEach((item: any) => { const newSelectedList = this.selectedRows.filter((r: any) => r.id === item.id); if (newSelectedList.length === 0) { this.selectedRows.push(item); - } - }) + }); // 移除取消选中的行 const stList = this.st.list; stList.forEach(item => { @@ -396,12 +325,12 @@ export class DatatableOrderReportingComponent implements OnInit { const index = this.selectedRows.findIndex(_item => item.id === _item.id); if (index !== -1) this.selectedRows.splice(index, 1); } - }) + }); } } else if (e.type === 'loaded') { // 页面加载时勾选 (e?.loaded || []).forEach((r: any) => { - this.selectedRows.forEach((x) => { + this.selectedRows.forEach(x => { if (x.id === r.id) { r.checked = true; } @@ -415,7 +344,7 @@ export class DatatableOrderReportingComponent implements OnInit { setTimeout(() => { this.selectedRows = []; this.st.load(1); - }) + }); } /** @@ -425,7 +354,7 @@ export class DatatableOrderReportingComponent implements OnInit { // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); this.router.navigate(['../detail'], { queryParams: { - id: record.id, + id: record.id }, relativeTo: this.ar }); @@ -463,10 +392,9 @@ export class DatatableOrderReportingComponent implements OnInit { this.service.msgSrv.success('上传成功'); this.search(); } - }) + }); } - /** * * @param params 上传设置 @@ -479,8 +407,7 @@ export class DatatableOrderReportingComponent implements OnInit { nzComponentParams: {}, nzFooter: null }); - modalRef.afterClose.subscribe(res => { - }) + modalRef.afterClose.subscribe(res => {}); } /** @@ -496,8 +423,7 @@ export class DatatableOrderReportingComponent implements OnInit { }, nzFooter: null }); - modalRef.afterClose.subscribe(res => { - }) + modalRef.afterClose.subscribe(res => {}); } /** @@ -507,18 +433,17 @@ export class DatatableOrderReportingComponent implements OnInit { if (record?.billStatus !== '2') { return; } - this.openWainingModal('监管审核结果', record?.result) + this.openWainingModal('监管审核结果', record?.result); } - search() { this.selectedRows = []; this.st.load(1); } /** - * 异步导出 - */ + * 异步导出 + */ export() { this.service.exportStart({ ...this.sf?.value, pageSize: -1 }, this.service.$api_export_reporting_order); } @@ -527,15 +452,15 @@ export class DatatableOrderReportingComponent implements OnInit { this.modal.warning({ nzMask: false, nzTitle: title, - nzContent: content, - }) + nzContent: content + }); } /** * 查看轨迹 */ viewTrack(_record: any, trajectory: string) { - const title = trajectory === 'car' ? '车辆' : '司机' + const title = trajectory === 'car' ? '车辆' : '司机'; const modalRef = this.modal.create({ nzTitle: `查看${title}轨迹`, nzWidth: 1000, @@ -546,13 +471,12 @@ export class DatatableOrderReportingComponent implements OnInit { }, nzFooter: null }); - modalRef.afterClose.subscribe(res => { - }) + modalRef.afterClose.subscribe(res => {}); } /** - * 更新数据 - */ + * 更新数据 + */ updateData() { if (this.selectedRows.length === 0) { this.openWainingModal('请选择需要更新的数据'); @@ -565,7 +489,7 @@ export class DatatableOrderReportingComponent implements OnInit { this.selectedRows = []; this.st.reload(); } - }) + }); } filterStatus(status: number) { @@ -578,7 +502,6 @@ export class DatatableOrderReportingComponent implements OnInit { return '上传异常'; default: return ''; - } } @@ -592,16 +515,15 @@ export class DatatableOrderReportingComponent implements OnInit { return '不通过'; default: return ''; - } } routeToOrder(item: any) { if (item.billType === '1') { window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`); - } else if (item.billType === '2') { + } else if (item.billType === '2') { window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`); - } else if (item.billType === '3') { + } else if (item.billType === '3') { window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`); } } @@ -609,13 +531,10 @@ export class DatatableOrderReportingComponent implements OnInit { routeTowaybill(item: any) { if (item.billType === '1') { window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`); - } else if (item.billType === '2') { window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`); } else if (item.billType === '3') { window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`); - } } - } diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts index 86da8648..c0a93ad2 100644 --- a/src/app/routes/datatable/reporting/services/reporting.service.ts +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -1,10 +1,10 @@ import { Injectable, Injector } from '@angular/core'; -import { BaseService } from '@shared'; +import { BaseService, ShipperBaseService } from '@shared'; @Injectable({ providedIn: 'root' }) -export class ReportingService extends BaseService { +export class ReportingService extends ShipperBaseService { $api_get_order_reporting_page = `/api/sdc/regulation/list/queryPage`; // 订单上报-列表 $api_upload_order_reporting = `/api/sdc/regulation/push`; // 上传订单上报 diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index 0b22f9bd..adea49fc 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -11,15 +11,13 @@ import { Injectable, Injector } from '@angular/core'; import { _HttpClient } from '@delon/theme'; -import { NzMessageService } from 'ng-zorro-antd/message'; +import { ShipperBaseService } from '@shared'; import { map } from 'rxjs/operators'; -import { BaseService } from 'src/app/shared/services/core/base.service'; -import { EAFileUtil } from 'src/app/shared/utils/file.util'; @Injectable({ providedIn: 'root', }) -export class DataService extends BaseService { +export class DataService extends ShipperBaseService { // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; diff --git a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html index 5ba2e9bf..b21bb753 100644 --- a/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html +++ b/src/app/routes/tax-management/components/individual-collect/individual-collect.component.html @@ -32,7 +32,7 @@ -
+
已选择 {{ selectedRows.length }} 条数据 diff --git a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less b/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less deleted file mode 100644 index 94ec07e0..00000000 --- a/src/app/routes/tax-management/components/invoice-reporting/invoice-reporting.component.less +++ /dev/null @@ -1,22 +0,0 @@ -:host { - .text-black { - color: #000; - } - .icon { - display: inline-block; - width: 1em; - height: 1em; - stroke-width: 0; - stroke: currentColor; - /* stylelint-disable-next-line order/properties-order */ - fill: currentColor; - } - ::ng-deep { - .imgBox { - display: flex; - img { - width: 60px !important; - } - } - } -} 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 1343b38f..577406c9 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 @@ -2,7 +2,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent, STData } from '@delon/abc/st'; import { SFDateWidgetSchema, SFSchemaEnum, SFSelectWidgetSchema } from '@delon/form'; -import { SearchDrawerService, ShipperBaseService } from '@shared'; +import { SearchDrawerService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; @@ -34,7 +34,6 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im public service: TaxManagementService, private router: Router, private ar: ActivatedRoute, - public shipperservice: ShipperBaseService, private modal: NzModalService, public searchDrawerService: SearchDrawerService ) { @@ -163,7 +162,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im widget: 'select', placeholder: '请选择', allowClear: true, - asyncData: () => this.shipperservice.getNetworkFreightForwarder() + asyncData: () => this.service.getNetworkFreightForwarder() } }, recentlyPutTime: {