diff --git a/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts b/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts index 8fa79108..0241608e 100644 --- a/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts +++ b/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.ts @@ -244,7 +244,7 @@ export class ContractManagementTemplateFrameComponent implements OnInit { this.service.request(this.service.$api_deletebatch_contractTemplate, [value.id]).subscribe(res => { if (res) { this.service.msgSrv.success('删除成功！'); - this.st.reload(1) + this.st.reload() } }) }); diff --git a/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts b/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts index 71ca4229..24d93d4e 100644 --- a/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts +++ b/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.ts @@ -244,7 +244,7 @@ export class ContractManagementTemplatePartnerComponent implements OnInit { this.service.request(this.service.$api_deletebatch_contractTemplate, [value.id]).subscribe(res => { if (res) { this.service.msgSrv.success('删除成功！'); - this.st.reload(1) + this.st.reload() } }) }); diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html new file mode 100644 index 00000000..f8c1a030 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.html @@ -0,0 +1,50 @@ + + + + +
+ +
+ + + + + + +
+ + +
+
+
+ + + + + +
+
+ + + + +
+ +
+
+
+ +
+
+ +
+
+ +
+ +
+ + \ No newline at end of file diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.less b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.less new file mode 100644 index 00000000..32c6893e --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.less @@ -0,0 +1,11 @@ +.chooseBox{ + display: flex; +} +.timeBox{ + display: flex; + margin: 0 0 0 10px; +} +.dateBox{ + display: inline-block; + margin: 0 0 0 10px; +} diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.spec.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.spec.ts new file mode 100644 index 00000000..00c629be --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableBusiindexComponent } from './busiindex.component'; + +describe('DatatableBusiindexComponent', () => { + let component: DatatableBusiindexComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatableBusiindexComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableBusiindexComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts new file mode 100644 index 00000000..bfe52480 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/busiindex.component.ts @@ -0,0 +1,125 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { DatePipe, _HttpClient } from '@delon/theme'; +import { differenceInCalendarDays } from 'date-fns'; +import { DataService } from '../../../services/data.service'; + +@Component({ + selector: 'app-datatable-busiindex', + templateUrl: './busiindex.component.html', + styleUrls: ['./busiindex.component.less'], + providers: [DatePipe] + +}) +export class DatatableBusiindexComponent implements OnInit { + @ViewChild('st') private readonly st!: STComponent; + type = 1; + mode = 'year'; + date: any = null; + time: any = ['2022-01-01 00:00:00'] + defineDate = []; + dateNext: any = null; + modeNext = 'year'; + timeNext: any = ['2022-01-01 00:00:00'] + dateFormat = 'yyyy-MM-dd'; + today = new Date(); + chartData: any = [] + + columns: STColumn[] = [ + { title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, + { title: '合伙人数', index: 'partnerNumber', className: 'text-center' }, + { title: '客户数', index: 'enterpriseNumbe', className: 'text-center' }, + { title: '订单数', index: 'zsl', className: 'text-center' }, + { title: '客户预存款', index: 'czcgje', className: 'text-center' }, + { title: '业绩量', index: 'yisje', className: 'text-center' }, + { title: '已收附加费', index: 'yisfjf', className: 'text-center' }, + { title: '平均附加费率', index: 'fjfl', className: 'text-center' }, + { title: '已开票金额', index: 'ykpje', className: 'text-center' } + ]; + /** + * 查询参数 + */ + get reqParams() { + if(this.mode === 'year') { + this.type = 1 + } else if(this.mode === 'month') { + this.type = 2 + } else if(this.mode === 'date') { + this.type = 3 + } else { + this.type = 4 + } + let params: any = { + time: this.time, + type: this.type + }; + + delete params._$expand; + return { ...params }; + } + + constructor(public service: DataService, private datePipe: DatePipe) { } + ngOnInit(): void { + this.initData() + } + initData(){ + let type = 1 + if(this.mode === 'year') { + type = 1 + } else if(this.mode === 'month') { + type = 2 + } + const params: any = { + time: this.timeNext, + type + }; + this.service.getPerformanceReportHistogram(params).subscribe(res => { + if (res) { + this.chartData = res + } + }) + } + changeData(){ + if(this.mode === 'year') { + this.dateFormat = 'yyyy' + } else if(this.mode === 'month') { + this.dateFormat = 'yyyy-MM' + } else { + this.dateFormat = 'yyyy-MM-dd' + } + } + onChange(result: any) { + if(this.mode === 'year') { + this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00'] + } else if(this.mode === 'month') { + this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00'] + } else if(this.mode === 'date') { + this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] + } else{ + this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] + } + this.st.reload({ ...this.reqParams }); + } + + changeDataNext() { + if(this.mode === 'year') { + this.dateFormat = 'yyyy' + } else if(this.mode === 'month') { + this.dateFormat = 'yyyy-MM' + } + } + onChangeNext(result: any) { + if(this.mode === 'year') { + this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00'] + } else if(this.mode === 'month') { + this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] + } + } + disabledDate = (current: Date): boolean => + // Can not select days before today and today + differenceInCalendarDays(current, this.today) > 0; + exportFun(){ + + } + +} diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.html b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.html new file mode 100644 index 00000000..0640a4d4 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.less b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.spec.ts b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.spec.ts new file mode 100644 index 00000000..cd009e56 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableDataindexComponent } from './dataindex.component'; + +describe('DatatableDataindexComponent', () => { + let component: DatatableDataindexComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatableDataindexComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableDataindexComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts new file mode 100644 index 00000000..35dbdcdb --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/curve/curve.component.ts @@ -0,0 +1,74 @@ +import { Component, ElementRef, Input, NgZone, OnInit, ViewChild } from '@angular/core'; +import { G2MiniAreaClickItem } from '@delon/chart/mini-area'; +import DataSet from '@antv/data-set'; +import { Chart } from '@antv/g2'; +import { DataService } from 'src/app/routes/datatable/services/data.service'; +@Component({ + selector: 'app-busitable-curve', + templateUrl: './curve.component.html', + styleUrls: ['./curve.component.less'] +}) +export class busitableCurveComponent implements OnInit { + @Input() chartData: any = {} + constructor(private service: DataService, private ngZone: NgZone) { + + } + + ngOnInit(): void { + + } + + + + + handleClick(data: G2MiniAreaClickItem): void { + this.service.msgSrv.info(`${data.item.x} - ${data.item.y}`); + } + + render(el: ElementRef): void { + this.ngZone.runOutsideAngular(() => this.init(el.nativeElement)); + } + private init(el: HTMLElement): void { + const data = [ + { month: '01月', value: 3 }, + { month: '02月', value: 4 }, + { month: '03月', value: 3.5 }, + { month: '04月', value: 5 }, + { month: '05月', value: 4.9 }, + { month: '06月', value: 6 }, + { month: '07月', value: 7 }, + { month: '08月', value: 9 }, + { month: '09月', value: 13 }, + { month: '10月', value: 13 }, + { month: '11月', value: 13 }, + { month: '12月', value: 13 }, + ]; + const chart = new Chart({ + container: el, + autoFit: true, + height: 500, + }); + + chart.data(data); + chart.scale({ + month: { + range: [0, 1], + }, + value: { + min: 0, + nice: true, + }, + }); + + chart.tooltip({ + showCrosshairs: true, // 展示 Tooltip 辅助线 + shared: true, + }); + + chart.line().position('month*value').label('value'); + //chart.point().position('month*value'); + + chart.render(); +} + +} \ No newline at end of file diff --git a/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.html b/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.html new file mode 100644 index 00000000..0640a4d4 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.html @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.less b/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.less new file mode 100644 index 00000000..e69de29b diff --git a/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.spec.ts b/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.spec.ts new file mode 100644 index 00000000..cd009e56 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableDataindexComponent } from './dataindex.component'; + +describe('DatatableDataindexComponent', () => { + let component: DatatableDataindexComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatableDataindexComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableDataindexComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.ts b/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.ts new file mode 100644 index 00000000..b651b086 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/busiindex/pillar/pillar.component.ts @@ -0,0 +1,52 @@ +import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; +import { Chart } from '@antv/g2'; +import { DataService } from 'src/app/routes/datatable/services/data.service'; +@Component({ + selector: 'app-busitable-pillar', + templateUrl: './pillar.component.html', + styleUrls: ['./pillar.component.less'] +}) +export class busitablePillarComponent implements OnInit { + el: any; + @Input() chartData: any ; + constructor(private service: DataService, private ngZone: NgZone) { + + } + ngOnInit(): void { + this.initData() + } + initData(){ + this.service.request(this.service.$api_performanceReportHistogram).subscribe(res => { + if (res) { + this.chartData = res.performance + this.ngZone.runOutsideAngular(() => this.init(this.el)); + } + }) + } + render(el: ElementRef): void { + this.el = el + } + + + private init(el: HTMLElement): void { + const chart = new Chart({ + container: el, + autoFit: true, + height: 500, + }); + + chart.data(this.chartData); + + chart.tooltip({ + showMarkers: false, + }); + + chart.interval().position('time*number'); + + chart.interaction('element-active'); + + chart.render(); + + } + +} \ No newline at end of file diff --git a/src/app/routes/datatable/components/busitable/mantable/mantable.component.html b/src/app/routes/datatable/components/busitable/mantable/mantable.component.html new file mode 100644 index 00000000..835e4a2e --- /dev/null +++ b/src/app/routes/datatable/components/busitable/mantable/mantable.component.html @@ -0,0 +1,42 @@ + + + + +
+
+ + + + + + +
+ + +
+ +
+
+ + + + + + +
+
+ + + + +
+ +
+
+
+ + + \ No newline at end of file diff --git a/src/app/routes/datatable/components/busitable/mantable/mantable.component.less b/src/app/routes/datatable/components/busitable/mantable/mantable.component.less new file mode 100644 index 00000000..6b4b1cba --- /dev/null +++ b/src/app/routes/datatable/components/busitable/mantable/mantable.component.less @@ -0,0 +1,11 @@ +.chooseBox{ + display: flex; +} +.timeBox{ + display: flex; + margin: 0 0 0 10px; +} +.dateBox{ + display: inline-block; + margin: 0 0 0 10px; +} \ No newline at end of file diff --git a/src/app/routes/datatable/components/busitable/mantable/mantable.component.spec.ts b/src/app/routes/datatable/components/busitable/mantable/mantable.component.spec.ts new file mode 100644 index 00000000..2aa60931 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/mantable/mantable.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableMantableComponent } from './mantable.component'; + +describe('DatatableMantableComponent', () => { + let component: DatatableMantableComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatableMantableComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableMantableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts b/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts new file mode 100644 index 00000000..61eec620 --- /dev/null +++ b/src/app/routes/datatable/components/busitable/mantable/mantable.component.ts @@ -0,0 +1,109 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { DatePipe, _HttpClient } from '@delon/theme'; +import { differenceInCalendarDays } from 'date-fns'; +import { DataService } from '../../../services/data.service'; + +@Component({ + selector: 'app-datatable-mantable', + templateUrl: './mantable.component.html', + styleUrls: ['./mantable.component.less'], + providers: [DatePipe] + +}) +export class DatatableMantableComponent implements OnInit { + @ViewChild('st') private readonly st!: STComponent; + type = 1; + mode = 'year'; + date: any = null; + defineDate = []; + time: any = ['2022-01-01 00:00:00'] + dateFormat = 'yyyy-MM-dd'; + today = new Date(); + dateNext: any = null; + modeNext = 'year'; + timeNext: any = ['2022-01-01 00:00:00'] + + columns: STColumn[] = [ + { title: '部门', index: 'networkTransporterName', className: 'text-center' }, + { title: '业务员', index: 'zsl', className: 'text-center' }, + { title: '合伙人数', index: 'yingsje', className: 'text-center' }, + { title: '客户数', index: 'cys', className: 'text-center' }, + { title: '客户活跃率', index: 'yingfyf', className: 'text-center' }, + { title: '客户预存款', index: 'yl', className: 'text-center' }, + { title: '订单数', index: 'djd', className: 'text-center' }, + { title: '订单金额', index: 'ysz', className: 'text-center' }, + { title: '业绩量', index: 'yswc', className: 'text-center' }, + { title: '附加费金额', index: 'yisje', className: 'text-center' }, + { title: '平均附加费率', index: 'yifyf', className: 'text-center' }, + { title: '已开票金额', index: 'yifyf', className: 'text-center' } + ]; + /** + * 查询参数 + */ + get reqParams() { + if(this.mode === 'year') { + this.type = 1 + } else if(this.mode === 'month') { + this.type = 2 + } else if(this.mode === 'date') { + this.type = 3 + } else { + this.type = 4 + } + let params: any = { + time: this.time, + type: this.type + }; + + delete params._$expand; + return { ...params }; + } + + constructor(public service: DataService, private datePipe: DatePipe) { } + ngOnInit(): void { } + + changeData(){ + if(this.mode === 'year') { + this.dateFormat = 'yyyy' + } else if(this.mode === 'month') { + this.dateFormat = 'yyyy-MM' + } else { + this.dateFormat = 'yyyy-MM-dd' + } + } + onChange(result: any) { + if(this.mode === 'year') { + this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00'] + } else if(this.mode === 'month') { + this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00'] + } else if(this.mode === 'date') { + this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] + } else{ + this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] + } + this.st.reload({ ...this.reqParams }); + } + + changeDataNext() { + if(this.mode === 'year') { + this.dateFormat = 'yyyy' + } else if(this.mode === 'month') { + this.dateFormat = 'yyyy-MM' + } + } + onChangeNext(result: any) { + if(this.mode === 'year') { + this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00'] + } else if(this.mode === 'month') { + this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] + } + } + disabledDate = (current: Date): boolean => + // Can not select days before today and today + differenceInCalendarDays(current, this.today) > 0; + exportFun(){ + + } + +} diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.html b/src/app/routes/datatable/components/compliance/customer/customer.component.html new file mode 100644 index 00000000..56092666 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.ts b/src/app/routes/datatable/components/compliance/customer/customer.component.ts new file mode 100644 index 00000000..1546a048 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-datatable-compliance-customer', + templateUrl: './customer.component.html', +}) +export class DatatableComplianceCustomerComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = [ + { title: '编号', index: 'no' }, + { title: '调用次数', type: 'number', index: 'callNo' }, + { title: '头像', type: 'img', width: '50px', index: 'avatar' }, + { title: '时间', type: 'date', index: 'updatedAt' }, + { + title: '', + buttons: [ + // { text: '查看', click: (item: any) => `/form/${item.id}` }, + // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, + ] + } + ]; + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/datatable/components/compliance/index/index.component.html b/src/app/routes/datatable/components/compliance/index/index.component.html new file mode 100644 index 00000000..dbcfc3c0 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/index/index.component.html @@ -0,0 +1,66 @@ + + + + +
+
+ +
+
+
+
+ + + + +
+ +
+
+
+
+
+ + +
+
+ + +
+ 合格：12423 不合格：12423 +
+ + +
+
+ + +
+ 货源单：12423 合同单：12423 +
+ + +
+
+ + +
+ 司机：12423 车队长：12423 +
+ + +
+
+ + +
+ 准时：12423 逾期：12423 +
+ + +
+
+ + + + diff --git a/src/app/routes/datatable/components/compliance/index/index.component.less b/src/app/routes/datatable/components/compliance/index/index.component.less new file mode 100644 index 00000000..3d0d3e63 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/index/index.component.less @@ -0,0 +1,17 @@ +.card-f{ + color: #5a5a5a; + .card-f-l{ + margin-right: 24px; + } +} +.chooseBox{ + display: flex; +} +.timeBox{ + display: flex; + margin: 0 0 0 10px; +} +.dateBox{ + display: inline-block; + margin: 0 0 0 10px; +} \ No newline at end of file diff --git a/src/app/routes/datatable/components/compliance/index/index.component.ts b/src/app/routes/datatable/components/compliance/index/index.component.ts new file mode 100644 index 00000000..b50e7764 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/index/index.component.ts @@ -0,0 +1,125 @@ +import { Component, ElementRef, NgZone, OnInit, ViewChild } from '@angular/core'; +import { DatePipe, ModalHelper, _HttpClient } from '@delon/theme'; +import { G2MiniAreaClickItem, G2MiniAreaData } from '@delon/chart/mini-area'; +import { format } from 'date-fns'; +import { SFComponent, SFDateWidgetSchema, SFRadioWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { G2TimelineData, G2TimelineMap } from '@delon/chart/timeline'; +import { Chart } from '@antv/g2'; +const DataSet = require('@antv/data-set'); +@Component({ + selector: 'app-datatable-compliance-index', + templateUrl: './index.component.html', + styleUrls: ['./index.component.less'], + providers: [DatePipe] +}) +export class DatatableComplianceIndexComponent implements OnInit { + @ViewChild('sf', { static: false }) + sf!: SFComponent; + ui!: SFUISchema; + schema: SFSchema = {}; + + mode = 'year'; + date: any = null; + dateFormat = 'yyyy-MM-dd'; + time: any = ['2022-01-01 00:00:00'] + constructor(private http: _HttpClient, private modal: ModalHelper, private ngZone: NgZone, private datePipe: DatePipe) {} + + ngOnInit(): void { + this.initSF(); + } + + changeData(){ + if(this.mode === 'year') { + this.dateFormat = 'yyyy' + } else if(this.mode === 'month') { + this.dateFormat = 'yyyy-MM' + } else { + this.dateFormat = 'yyyy-MM-dd' + } + } + + onChange(result: any) { + if(this.mode === 'year') { + this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00'] + } else if(this.mode === 'month') { + this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00'] + } + } + + initSF() { + this.schema = { + properties: { + name: { + type: 'string', + title: '', + ui: { + widget: 'select', + placeholder: '网络货运人' + } + }, + name2: { + type: 'string', + title: '', + ui: { + widget: 'select', + placeholder: '部门' + } + }, + name3: { + type: 'string', + title: '', + ui: { + placeholder: '业务员' + } + } + } + }; + this.ui = { + '*': { + grid: { span: 4 } + } + }; + + } + + data = [ + { Date: '22 February', 订单合格率: 50000, 付款及时率: 125000 }, + { Date: '28 February', 订单合格率: 60000, 付款及时率: 150000 }, + { Date: '3 March', 订单合格率: 100000, 付款及时率: 250000 }, + { Date: '20 March', 订单合格率: 200000, 付款及时率: 500000 }, + { Date: '7 April', 订单合格率: 250000, 付款及时率: 625000 }, + { Date: '13 June', 订单合格率: 210000, 付款及时率: 525000 } + ]; + render(el: ElementRef) { + this.ngZone.runOutsideAngular(() => this.init(el.nativeElement)); + } + + private init(el: HTMLElement): void { + const chart = new Chart({ + container: el, + autoFit: true, + height: 400 + }); + // 以三组数据为例, 需要展示 91/92/93年中a/b/c数据走势 + const data = [ + {x: '1991', z: 'a', y: 1}, + {x: '1991', z: 'b', y: 2}, + {x: '1991', z: 'c', y: 3}, + + {x: '1992', z: 'a', y: 11}, + {x: '1992', z: 'b', y: 22}, + {x: '1992', z: 'c', y: 33}, + + {x: '1993', z: 'a', y: 1}, + {x: '1993', z: 'b', y: 2}, + {x: '1993', z: 'c', y: 3} + ]; + + chart.data(data); + // 在x*y的坐标点上按z值绘制线条, 如果z值相同将使用直线连接 + chart.line().position('x*y').color('z'); + // 在x*y的坐标上按z值绘制圆点 + chart.point().position('x*y').size(4).color('z').shape('circle'); + chart.render(); + } +} diff --git a/src/app/routes/datatable/components/compliance/salesman/salesman.component.html b/src/app/routes/datatable/components/compliance/salesman/salesman.component.html new file mode 100644 index 00000000..56092666 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/salesman/salesman.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/app/routes/datatable/components/compliance/salesman/salesman.component.ts b/src/app/routes/datatable/components/compliance/salesman/salesman.component.ts new file mode 100644 index 00000000..3b6cd019 --- /dev/null +++ b/src/app/routes/datatable/components/compliance/salesman/salesman.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-datatable-compliance-salesman', + templateUrl: './salesman.component.html', +}) +export class DatatableComplianceSalesmanComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = [ + { title: '编号', index: 'no' }, + { title: '调用次数', type: 'number', index: 'callNo' }, + { title: '头像', type: 'img', width: '50px', index: 'avatar' }, + { title: '时间', type: 'date', index: 'updatedAt' }, + { + title: '', + buttons: [ + // { text: '查看', click: (item: any) => `/form/${item.id}` }, + // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, + ] + } + ]; + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html index ad2d6e42..d70ba207 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.html +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.html @@ -32,7 +32,6 @@ - @@ -51,7 +50,7 @@
- +
diff --git a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts index 5ff3a3eb..c2acb2b1 100644 --- a/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts +++ b/src/app/routes/datatable/components/customtable/customindex/customindex.component.ts @@ -20,6 +20,9 @@ export class DatatableCustomindexComponent implements OnInit { time: any = ['2022-01-01 00:00:00'] dateFormat = 'yyyy-MM-dd'; today = new Date(); + dateNext: any = null; + modeNext = 'year'; + timeNext: any = ['2022-01-01 00:00:00'] columns: STColumn[] = [ { title: '用户类型', index: 'networkTransporterName', className: 'text-center' }, @@ -34,12 +37,12 @@ export class DatatableCustomindexComponent implements OnInit { /** * 查询参数 */ - get reqParams() { - if(this.mode === 'year') { + get reqParams() { + if (this.mode === 'year') { this.type = 1 - } else if(this.mode === 'month') { + } else if (this.mode === 'month') { this.type = 2 - } else if(this.mode === 'date') { + } else if (this.mode === 'date') { this.type = 3 } else { this.type = 4 @@ -47,8 +50,8 @@ export class DatatableCustomindexComponent implements OnInit { let params: any = { time: this.time, type: this.type - }; - + }; + delete params._$expand; return { ...params }; } @@ -56,23 +59,23 @@ export class DatatableCustomindexComponent implements OnInit { constructor(public service: DataService, private datePipe: DatePipe) { } ngOnInit(): void { } - changeData(){ - if(this.mode === 'year') { + changeData() { + if (this.mode === 'year') { this.dateFormat = 'yyyy' - } else if(this.mode === 'month') { + } else if (this.mode === 'month') { this.dateFormat = 'yyyy-MM' } else { this.dateFormat = 'yyyy-MM-dd' - } + } } onChange(result: any) { - if(this.mode === 'year') { + if (this.mode === 'year') { this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00'] - } else if(this.mode === 'month') { + } else if (this.mode === 'month') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00'] - } else if(this.mode === 'date') { + } else if (this.mode === 'date') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] - } else{ + } else { this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] } this.st.reload({ ...this.reqParams }); @@ -80,7 +83,22 @@ export class DatatableCustomindexComponent implements OnInit { disabledDate = (current: Date): boolean => // Can not select days before today and today differenceInCalendarDays(current, this.today) > 0; - exportFun(){ + + changeDataNext() { + if (this.mode === 'year') { + this.dateFormat = 'yyyy' + } else if (this.mode === 'month') { + this.dateFormat = 'yyyy-MM' + } + } + onChangeNext(result: any) { + if (this.mode === 'year') { + this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00'] + } else if (this.mode === 'month') { + this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] + } + } + exportFun() { } diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html new file mode 100644 index 00000000..482ccb06 --- /dev/null +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.spec.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.spec.ts new file mode 100644 index 00000000..8df0f556 --- /dev/null +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableMancustomtableComponent } from './mancustomtable.component'; + +describe('DatatableMancustomtableComponent', () => { + let component: DatatableMancustomtableComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatableMancustomtableComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableMancustomtableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts new file mode 100644 index 00000000..7f41c8ca --- /dev/null +++ b/src/app/routes/datatable/components/customtable/mancustomtable/mancustomtable.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-datatable-mancustomtable', + templateUrl: './mancustomtable.component.html', +}) +export class DatatableMancustomtableComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = [ + { title: '编号', index: 'no' }, + { title: '调用次数', type: 'number', index: 'callNo' }, + { title: '头像', type: 'img', width: '50px', index: 'avatar' }, + { title: '时间', type: 'date', index: 'updatedAt' }, + { + title: '', + buttons: [ + // { text: '查看', click: (item: any) => `/form/${item.id}` }, + // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, + ] + } + ]; + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html new file mode 100644 index 00000000..e5937465 --- /dev/null +++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.html @@ -0,0 +1,43 @@ + + + +
+ +
+ + + + +
+ + + +
+ +
+
+ + + +
+ +
+ + + +
+ +
+ + + + + \ No newline at end of file diff --git a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.spec.ts b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.spec.ts new file mode 100644 index 00000000..69ae8c3b --- /dev/null +++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatablePartnertableComponent } from './partnertable.component'; + +describe('DatatablePartnertableComponent', () => { + let component: DatatablePartnertableComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ DatatablePartnertableComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatablePartnertableComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts new file mode 100644 index 00000000..444a18c8 --- /dev/null +++ b/src/app/routes/datatable/components/customtable/partnertable/partnertable.component.ts @@ -0,0 +1,147 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { ModalHelper } from '@delon/theme'; +import { EAEnvironmentService } from '@shared'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { DataService } from '../../../services/data.service'; + +@Component({ + selector: 'app-datatable-partnertable', + templateUrl: './partnertable.component.html', +}) +export class DatatablePartnertableComponent implements OnInit { + @ViewChild('st', { static: false }) st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + _$expand = false; + ui!: SFUISchema; + schema!: SFSchema; + phone = ''; + columns!: STColumn[]; + + constructor( + public service: DataService, + private modalSrv: NzModalService, + private modal: ModalHelper, + private envSrv: EAEnvironmentService, + ) {} + + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + + /** + * 查询参数 + */ + get reqParams() { + const params = Object.assign({}, this.sf?.value || {}); + delete params._$expand; + return { ...params }; + } + + /** + * 选中行 + */ + get selectedRows() { + return this.st?.list.filter((item) => item.checked) || []; + } + + /** + * 伸缩查询条件 + */ + expandToggle() { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + /** + * 重置表单 + */ + resetSF() { + this.sf.reset(); + this._$expand = false; + } + /** + * 程序初始化入口 + */ + ngOnInit() { + this.initSF(); + this.initST() + } + + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + name: { + title: '合伙人名称', + type: 'string', + ui: { placeholder: '请输入' }, + readOnly: false, + }, + phone: { + title: '合伙人类型', + type: 'string', + ui: { + widget: 'select', + placeholder: '请输入' }, + readOnly: false, + }, + phone01: { + title: '合伙人状态', + type: 'string', + ui: { + widget: 'select', + placeholder: '请输入' }, + readOnly: false, + }, + createTime: { + type: 'string', + title: '注册时间', + ui: { widget: 'sl-from-to', type: 'date', format: 'yyyy-MM-dd' } as SFDateWidgetSchema, + }, + }, + type: 'object', + }; + this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 }, enter: () => this.st?.load(1) } }; + } + + /** + * 初始化数据列表 + */ + initST() { + this.columns = [ + { title: '合伙人名称', index: 'name', className: 'text-center' }, + { title: '注册时间', index: 'telephone', className: 'text-center' }, + { title: '注册时间', index: 'roleName', className: 'text-center' }, + { title: '业务员', index: 'lastLoginDate', className: 'text-center' }, + { + title: '合伙人状态', + index: 'stateLocked', + className: 'text-center', + type: 'enum', + enum: { 0: '正常', 1: '冻结' }, + }, + { title: '客户数', index: 'lastLoginDate', className: 'text-center' }, + { title: '收益额', index: 'lastLoginDate', className: 'text-center' }, + { title: '已提现金额', index: 'lastLoginDate', className: 'text-center' }, + { title: '订单数', index: 'lastLoginDate', className: 'text-center' }, + { title: '订单金额', index: 'lastLoginDate', className: 'text-center' }, + { title: '应收订单数', index: 'lastLoginDate', className: 'text-center' }, + ]; + } + + /** + * 数据列表状态变化事件 + */ + change(change: STChange) { + // console.log(change); + } + + +} diff --git a/src/app/routes/datatable/components/financetable/financetable.component.html b/src/app/routes/datatable/components/financetable/financetable.component.html new file mode 100644 index 00000000..56092666 --- /dev/null +++ b/src/app/routes/datatable/components/financetable/financetable.component.html @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/app/routes/datatable/components/financetable/financetable.component.ts b/src/app/routes/datatable/components/financetable/financetable.component.ts new file mode 100644 index 00000000..00e0f1b3 --- /dev/null +++ b/src/app/routes/datatable/components/financetable/financetable.component.ts @@ -0,0 +1,45 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-datatable-financetable', + templateUrl: './financetable.component.html', +}) +export class DatatableFinancetableComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = [ + { title: '编号', index: 'no' }, + { title: '调用次数', type: 'number', index: 'callNo' }, + { title: '头像', type: 'img', width: '50px', index: 'avatar' }, + { title: '时间', type: 'date', index: 'updatedAt' }, + { + title: '', + buttons: [ + // { text: '查看', click: (item: any) => `/form/${item.id}` }, + // { text: '编辑', type: 'static', component: FormEditComponent, click: 'reload' }, + ] + } + ]; + + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + ngOnInit(): void { } + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.html b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html new file mode 100644 index 00000000..13411ab5 --- /dev/null +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.html @@ -0,0 +1,14 @@ + + + + + + diff --git a/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts new file mode 100644 index 00000000..9916e4c4 --- /dev/null +++ b/src/app/routes/datatable/components/invoicetable/invoicetable.component.ts @@ -0,0 +1,70 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; + +@Component({ + selector: 'app-datatable-invoicetable', + templateUrl: './invoicetable.component.html', +}) +export class DatatableInvoicetableComponent implements OnInit { + @ViewChild('st', { static: false }) + st!: STComponent; + columns!: STColumn[]; + + data=[{name1:1111}] + constructor(private http: _HttpClient, private modal: ModalHelper) { } + + /** + * 查询参数 + */ + get reqParams() { + return { }; + } + ngOnInit(): void { + this.initST(); + } + initST() { + this.columns = [ + { + title: '运营主体', + index: 'name1' + }, + { + title: '已开票总金额', + index: 'name1' + }, + { + title: '当月已开票金额', + index: 'name1' + }, + { + title: '已申请待开金额', + index: 'name1' + }, + { + title: '未申请开票金额（历史）', + index: 'name1' + }, + { + title: '未申请开票金额（当月）', + index: 'name1' + }, + { + title: '当月发票张数', + index: 'name1' + }, + { + title: '剩余发票张数', + index: 'name1' + }, + + ]; + } + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + +} diff --git a/src/app/routes/datatable/components/operationtable/curve/curve.component.ts b/src/app/routes/datatable/components/operationtable/curve/curve.component.ts index 96336369..8f76f6cd 100644 --- a/src/app/routes/datatable/components/operationtable/curve/curve.component.ts +++ b/src/app/routes/datatable/components/operationtable/curve/curve.component.ts @@ -37,7 +37,7 @@ export class OperationtableCurveComponent implements OnInit { { name: '订单数', month: '05', count: 47 }, { name: '承运数', month: '05', count: 124 }, { name: '订单数', month: '06', count: 203 }, - { name: '承运数', month: '06', count: 213 }, + { name: '承运数', month: '06', count: 203 }, { name: '订单数', month: '07', count: 24 }, { name: '订单数', month: '08', count: 356 }, { name: '承运数', month: '09', count: 124 }, diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.html b/src/app/routes/datatable/components/operationtable/operationtable.component.html index f6207669..bfd7283d 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.html +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.html @@ -25,17 +25,19 @@ [scroll]="{ x: '1200px' }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [page]="{ show: true, showSize: true, pageSizes: [20, 50, 100] }" [loading]="false"> - - + +
- + + +
- +
- +
@@ -43,5 +45,8 @@ + + + \ No newline at end of file diff --git a/src/app/routes/datatable/components/operationtable/operationtable.component.ts b/src/app/routes/datatable/components/operationtable/operationtable.component.ts index 5cbb1200..51a2f215 100644 --- a/src/app/routes/datatable/components/operationtable/operationtable.component.ts +++ b/src/app/routes/datatable/components/operationtable/operationtable.component.ts @@ -19,8 +19,13 @@ export class DatatableOperationtableComponent implements OnInit { defineDate = []; time: any = ['2022-01-01 00:00:00'] dateFormat = 'yyyy-MM-dd'; + dateNext: any = null; + modeNext = 'year'; + timeNext: any = ['2022-01-01 00:00:00'] today = new Date(); - + enterpriseInfoId = '' + enterpriseInfoIdPie = '' + interManlist: any = [] columns: STColumn[] = [ { title: '运营主体', index: 'networkTransporterName', className: 'text-center' }, { title: '订单数', index: 'zsl', className: 'text-center' }, @@ -37,12 +42,12 @@ export class DatatableOperationtableComponent implements OnInit { /** * 查询参数 */ - get reqParams() { - if(this.mode === 'year') { + get reqParams() { + if (this.mode === 'year') { this.type = 1 - } else if(this.mode === 'month') { + } else if (this.mode === 'month') { this.type = 2 - } else if(this.mode === 'date') { + } else if (this.mode === 'date') { this.type = 3 } else { this.type = 4 @@ -50,32 +55,41 @@ export class DatatableOperationtableComponent implements OnInit { let params: any = { time: this.time, type: this.type - }; - + }; + delete params._$expand; return { ...params }; } constructor(public service: DataService, private datePipe: DatePipe) { } - ngOnInit(): void { } + ngOnInit(): void { + this.initData() + } + initData() { + this.service.getNetworkFreightForwarder().subscribe(res => { + this.interManlist = res + this.enterpriseInfoId = res[0].value + this.enterpriseInfoIdPie = res[0].value + }) + } - changeData(){ - if(this.mode === 'year') { + changeData() { + if (this.mode === 'year') { this.dateFormat = 'yyyy' - } else if(this.mode === 'month') { + } else if (this.mode === 'month') { this.dateFormat = 'yyyy-MM' } else { this.dateFormat = 'yyyy-MM-dd' - } + } } onChange(result: any) { - if(this.mode === 'year') { + if (this.mode === 'year') { this.time = [this.datePipe.transform(this.date, 'yyyy') + '-01-01 00:00:00'] - } else if(this.mode === 'month') { + } else if (this.mode === 'month') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM') + '-01 00:00:00'] - } else if(this.mode === 'date') { + } else if (this.mode === 'date') { this.time = [this.datePipe.transform(this.date, 'yyyy-MM-dd') + ' 00:00:00'] - } else{ + } else { this.time = [this.datePipe.transform(this.defineDate[0], 'yyyy-MM-dd') + '00:00:00', this.datePipe.transform(this.defineDate[1], 'yyyy-MM-dd') + ' 00:00:00'] } this.st.reload({ ...this.reqParams }); @@ -83,8 +97,27 @@ export class DatatableOperationtableComponent implements OnInit { disabledDate = (current: Date): boolean => // Can not select days before today and today differenceInCalendarDays(current, this.today) > 0; - exportFun(){ + exportFun() { } + changeCurve(){ + } + changePie(){ + + } + changeDataNext() { + if(this.mode === 'year') { + this.dateFormat = 'yyyy' + } else if(this.mode === 'month') { + this.dateFormat = 'yyyy-MM' + } + } + onChangeNext(result: any) { + if(this.mode === 'year') { + this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy') + '-01-01 00:00:00'] + } else if(this.mode === 'month') { + this.timeNext = [this.datePipe.transform(this.dateNext, 'yyyy-MM') + '-01 00:00:00'] + } + } } diff --git a/src/app/routes/datatable/datatable-routing.module.ts b/src/app/routes/datatable/datatable-routing.module.ts index d9c49f29..f4788851 100644 --- a/src/app/routes/datatable/datatable-routing.module.ts +++ b/src/app/routes/datatable/datatable-routing.module.ts @@ -6,14 +6,34 @@ import { DatatableDriverComponent } from './components/customtable/driver/driver import { DatatableOperationtableComponent } from './components/operationtable/operationtable.component'; import { DatatableOrderReportingComponent } from './reporting/components/order-reporting/order-reporting.component'; import { DatatableDataindexComponent } from './components/dataindex/dataindex.component'; +import { DatatableComplianceIndexComponent } from './components/compliance/index/index.component'; +import { DatatableFinancetableComponent } from './components/financetable/financetable.component'; +import { DatatableInvoicetableComponent } from './components/invoicetable/invoicetable.component'; +import { DatatableComplianceSalesmanComponent } from './components/compliance/salesman/salesman.component'; +import { DatatableComplianceCustomerComponent } from './components/compliance/customer/customer.component'; +import { DatatableFundReportingComponent } from './reporting/components/fund-reporting/fund-reporting.component'; +import { DatatableMancustomtableComponent } from './components/customtable/mancustomtable/mancustomtable.component'; +import { DatatablePartnertableComponent } from './components/customtable/partnertable/partnertable.component'; +import { DatatableBusiindexComponent } from './components/busitable/busiindex/busiindex.component'; +import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component'; const routes: Routes = [ { path: 'dataindex', component: DatatableDataindexComponent }, { path: 'customtable/customindex', component: DatatableCustomindexComponent }, { path: 'customtable/owner', component: DatatableOwnerComponent }, { path: 'customtable/driver', component: DatatableDriverComponent }, + { path: 'customtable/mancustomtable', component: DatatableMancustomtableComponent }, + { path: 'customtable/partnertable', component: DatatablePartnertableComponent }, { path: 'operationtable', component: DatatableOperationtableComponent }, - { path: 'reporting/order', component: DatatableOrderReportingComponent }]; + { path: 'reporting/order', component: DatatableOrderReportingComponent }, + { path: 'compliancetabel/index', component: DatatableComplianceIndexComponent }, + { path: 'compliancetabel/salesman', component: DatatableComplianceSalesmanComponent }, + { path: 'compliancetabel/customer', component: DatatableComplianceCustomerComponent }, + { path: 'financetable', component: DatatableFinancetableComponent }, + { path: 'invoicetable', component: DatatableInvoicetableComponent }, + { path: 'reporting/fund', component: DatatableFundReportingComponent }, + { path: 'busitable/busiindex', component: DatatableBusiindexComponent }, + { path: 'busitable/mantable', component: DatatableMantableComponent }]; @NgModule({ diff --git a/src/app/routes/datatable/datatable.module.ts b/src/app/routes/datatable/datatable.module.ts index a3a39584..ca989464 100644 --- a/src/app/routes/datatable/datatable.module.ts +++ b/src/app/routes/datatable/datatable.module.ts @@ -9,6 +9,20 @@ import { OperationtablePieComponent } from './components/operationtable/pie/pie. import { DatatableOrderReportingComponent } from './reporting/components/order-reporting/order-reporting.component'; import { DatatableDataindexComponent } from './components/dataindex/dataindex.component'; import { OperationtableCurveComponent } from './components/operationtable/curve/curve.component'; +import { DatatableComplianceIndexComponent } from './components/compliance/index/index.component'; +import { DatatableFinancetableComponent } from './components/financetable/financetable.component'; +import { DatatableInvoicetableComponent } from './components/invoicetable/invoicetable.component'; +import { DatatableComplianceSalesmanComponent } from './components/compliance/salesman/salesman.component'; +import { DatatableComplianceCustomerComponent } from './components/compliance/customer/customer.component'; +import { DatatableReportingUploadSettingComponent } from './reporting/components/upload-setting/upload-setting.component'; +import { DatatableReportingVerifyResultComponent } from './reporting/components/verify-result/verify-result.component'; +import { DatatableFundReportingComponent } from './reporting/components/fund-reporting/fund-reporting.component'; +import { DatatableMancustomtableComponent } from './components/customtable/mancustomtable/mancustomtable.component'; +import { DatatablePartnertableComponent } from './components/customtable/partnertable/partnertable.component'; +import { DatatableBusiindexComponent } from './components/busitable/busiindex/busiindex.component'; +import { DatatableMantableComponent } from './components/busitable/mantable/mantable.component'; +import { busitableCurveComponent } from './components/busitable/busiindex/curve/curve.component'; +import { busitablePillarComponent } from './components/busitable/busiindex/pillar/pillar.component'; const COMPONENTS: Type[] = [ DatatableDataindexComponent, @@ -18,8 +32,23 @@ const COMPONENTS: Type[] = [ DatatableOperationtableComponent, OperationtablePieComponent, DatatableOrderReportingComponent, - OperationtableCurveComponent -]; + OperationtableCurveComponent, + DatatableComplianceIndexComponent, + DatatableFinancetableComponent, + DatatableInvoicetableComponent, + DatatableComplianceSalesmanComponent, + DatatableComplianceCustomerComponent, + DatatableReportingUploadSettingComponent, + DatatableReportingVerifyResultComponent, + DatatableFundReportingComponent, + DatatableMancustomtableComponent, + DatatablePartnertableComponent, + DatatableBusiindexComponent, + DatatableMantableComponent, + busitableCurveComponent, + busitablePillarComponent +] + @NgModule({ imports: [ 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 new file mode 100644 index 00000000..e55d1e52 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html @@ -0,0 +1,57 @@ + + + + +
+
+ +
+
+ + + + +
+
+ + + + + + + + + + + {{item?.billStatusLabel}} + {{item?.billStatusLabel}} + + + + + {{item?.billStatusLabel}} + {{item?.billStatusLabel}} + + +
{{item?.amount | currency :' '}}
+ + + + +
+
+ 已选择 + {{ selectedRows.length }} 条数据 +
+ + + +
+ diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less new file mode 100644 index 00000000..6009fbbf --- /dev/null +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.less @@ -0,0 +1,5 @@ +:host { + .text-black { + color: #000; + } +} diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts new file mode 100644 index 00000000..fb500388 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableFundReportingComponent } from './fund-reporting.component'; + +describe('DatatableFundReportingComponent', () => { + let component: DatatableFundReportingComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DatatableFundReportingComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableFundReportingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..e817b130 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -0,0 +1,445 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { ActivatedRoute, Router } from '@angular/router'; +import { STColumn, STComponent, STData } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; +import { ShipperBaseService } from '@shared'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { ReportingService } from '../../services/reporting.service'; +import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; +import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; + +@Component({ + selector: 'app-datatable-fund-reporting', + templateUrl: './fund-reporting.component.html', + styleUrls: ['./fund-reporting.component.less'] +}) +export class DatatableFundReportingComponent implements OnInit { + _$expand = false; + ui!: SFUISchema; + schema!: SFSchema; + columns!: STColumn[]; + @ViewChild('st', { static: false }) st!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + tabType!: string; + tabs: any[] = [ + { name: '待上传', value: '1' }, + { name: '上传中', value: '2' }, + { name: '已上传', value: '3' }, + { name: '异常', value: '4' }, + { name: '全部', value: '' } + ]; + selectedIndex = ''; //选择的项目 + serviceTel = ''; + constructor( + public service: ReportingService, + private router: Router, + private ar: ActivatedRoute, + private modal: NzModalService, + public shipperSrv: ShipperBaseService + ) { + } + + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + + /** + * 查询参数 + */ + get reqParams() { + const params = Object.assign({}, this.sf?.value || {}, { + representationsStatus: this.selectedIndex, + }); + delete params._$expand; + return { ...params }; + } + + /** + * 选中行 + */ + get selectedRows() { + 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; + } + /** + * 程序初始化入口 + */ + ngOnInit() { + this.initSF(); + this.initST(); + } + + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + billCode: { title: '订单号', type: 'string', ui: { placeholder: '请输入' } }, + resourceCode: { + type: 'string', + title: '运单号', + ui: { + placeholder: '请输入', + }, + }, + enterpriseInfoId: { + title: '网络货运人', + type: 'string', + ui: { + placeholder: '请选择', + widget: 'select', + asyncData: () => this.shipperSrv.getNetworkFreightForwarder({}, false), + + allowClear: true + } + }, + externalResourceCode: { + title: '货主', + type: 'string', + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + driverName: { + title: '承运司机', + type: 'string', + ui: { + placeholder: '请输入司机姓名/手机号', visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + carNo: { + title: '车牌号', + type: 'string', + maxLength: 9, + ui: { + placeholder: '请输入', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + serviceType: { + title: '上传状态', + type: 'string', + ui: { + placeholder: '请选择', + widget: 'dict-select', + params: { dictKey: 'service:type' }, + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + serviceType1: { + title: '本地校验', + type: 'string', + ui: { + placeholder: '请选择', + widget: 'dict-select', + params: { dictKey: 'service:type' }, + containsAllLabel: true, + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + createTime: { + title: '上传时间', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + createTime1: { + title: '运单生成时间', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + createTime2: { + title: '发货时间', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + createTime3: { + title: '收货时间', + type: 'string', + ui: { + widget: 'sl-from-to', + type: 'date', + format: 'yyyy-MM-dd', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } as SFDateWidgetSchema, + }, + + loadingPlace: { + title: '车辆轨迹', + type: 'string', + enum: [ + { label: '全部', value: '' }, + { label: '有', value: '1' }, + { label: '无', value: '0' } + ], + ui: { + placeholder: '请选择', + widget: 'select', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + loadingPlace1: { + title: '司机轨迹', + type: 'string', + enum: [ + { label: '全部', value: '' }, + { label: '有', value: '1' }, + { label: '无', value: '0' } + ], + ui: { + placeholder: '请选择', + widget: 'select', + visibleIf: { + _$expand: (value: boolean) => value, + }, + } + }, + }, + }; + this.ui = { + '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.search() }, + $time: { grid: { span: 24 } }, + }; + } + + /** + * 初始化数据列表 + */ + initST() { + this.columns = [ + { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, + { 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: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, + { + title: '订单号', + render: 'billComplianceVOS', + className: 'text-center', + width: '150px', + }, + { title: '运单号', render: 'freightDetails', className: 'text-center', width: '150px', }, + + { + title: '网络货运人', + render: 'serviceType', + className: 'text-center', + width: '180px', + }, + { 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: '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: 'payeeName', className: 'text-center', width: '150px' }, + { title: '运费金额', render: 'amount', className: 'text-center', width: '250px' }, + { 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: 'transportInfo', className: 'text-center', width: '200px' }, + { title: '司机身份证号', render: 'payeeName', className: 'text-center', width: '150px' }, + { title: '货物信息', render: 'transportInfo', className: 'text-center', width: '180px' }, + { 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: 'transportInfo', className: 'text-center', width: '150px' }, + { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, + ]; + } + + + + /** + *撤销 + * @param record 记录实例 + */ + recall() { + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要撤回的数据'); + return; + } + + this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { + if (res) { + this.search(); + } + }) + + } + + selectChange(item: any) { + this.selectedIndex = item?.representationsStatus || ''; + setTimeout(() => { + this.st.load(1); + }) + } + + /** + * 查看当行数据 + */ + view(record: STData) { + // this.router.navigate(['../view', record.uuid], { relativeTo: this.ar }); + this.router.navigate(['../detail'], { + queryParams: { + id: record.id, + }, + relativeTo: this.ar + }); + } + + // appeal(item: any) { + // const modalRef = this.modal.create({ + // nzTitle: '申诉', + // nzWidth: '40%', + // nzContent: CtcAppealComponent, + // nzComponentParams: { + // i: item, + // status: 'add' + // }, + // nzFooter: null + // }); + // modalRef.afterClose.subscribe(res => { + // if (res) { + // this.search({ representationsStatus: '' }); + // } + // }) + // } + + /** + * 上传 + */ + upload() { + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要上传的数据'); + return; + } + } + + + /** + * + * @param params 上传设置 + */ + uploadSetting() { + const modalRef = this.modal.create({ + nzTitle: '上传设置', + nzWidth: 600, + nzContent: DatatableReportingUploadSettingComponent, + nzComponentParams: {}, + nzFooter: null + }); + modalRef.afterClose.subscribe(res => { + }) + } + + /** + * 查看校验结果 + */ + viewResult(item: any) { + const modalRef = this.modal.create({ + nzTitle: '校验结果', + nzWidth: 1200, + nzContent: DatatableReportingVerifyResultComponent, + nzComponentParams: { + record: item + }, + nzFooter: null + }); + modalRef.afterClose.subscribe(res => { + }) + } + + /** + * 查看监管审核结果 + */ + viewAuditResult(record: any) { + if (record?.billStatus !== '2') { + return; + } + this.openWainingModal('监管审核结果', record?.result) + } + + + search() { + this.st.load(1); + } + + /** + * 异步导出 + */ + export() { + this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); + } + + openWainingModal(content: string, title = '提示') { + this.modal.warning({ + nzMask: false, + nzTitle: title, + nzContent: content, + }) + } + + +} 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 7724c122..e55d1e52 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 @@ -29,57 +29,29 @@ [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, 50, 100] }" [loading]="false"> - - {{item.billCode}} + + {{item?.billStatusLabel}} + {{item?.billStatusLabel}} + - -
-
{{item.expenseName}}:{{item.price | currency}}
-
+ + + {{item?.billStatusLabel}} + {{item?.billStatusLabel}} - -
{{ address }}
- - -
{{ address }}
- - -
-
货物名称 : {{item.goodsName}}
-
重量/体积 : {{item.weight}}/{{item.volume}}
-
车型/车长 :{{item.carModelLabel}}/{{item.carLengthLabel}}
-
- - -
{{item.driverName}}
-
{{item.driverPhone}}
-
{{item.carNo}}
- - -
{{item.payeeName}}
-
{{item.payeePhone}}
- - -
创建时间:{{item.createTime}}
-
装货时间:{{item.loadTime}}
-
卸货时间:{{item.unloadTime}}
- - -
{{item?.complianceName}}
- - -
{{item?.billTypeLabel}} （{{item?.serviceTypeLabel}}）
+ +
{{item?.amount | currency :' '}}
 -
+
已选择 {{ selectedRows.length }} 条数据
- +
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 new file mode 100644 index 00000000..6009fbbf --- /dev/null +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.less @@ -0,0 +1,5 @@ +:host { + .text-black { + color: #000; + } +} 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 28e93168..0c7ef2c2 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 @@ -1,15 +1,17 @@ import { Component, OnInit, ViewChild } from '@angular/core'; -import { Router, ActivatedRoute } from '@angular/router'; +import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STComponent, STData } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { ReportingService } from '../../services/reporting.service'; +import { DatatableReportingUploadSettingComponent } from '../upload-setting/upload-setting.component'; +import { DatatableReportingVerifyResultComponent } from '../verify-result/verify-result.component'; @Component({ selector: 'app-datatable-order-reporting', templateUrl: './order-reporting.component.html', + styleUrls: ['./order-reporting.component.less'] }) export class DatatableOrderReportingComponent implements OnInit { _$expand = false; @@ -226,7 +228,7 @@ export class DatatableOrderReportingComponent implements OnInit { ], ui: { placeholder: '请选择', - + widget: 'select', visibleIf: { _$expand: (value: boolean) => value, }, @@ -242,7 +244,7 @@ export class DatatableOrderReportingComponent implements OnInit { ], ui: { placeholder: '请选择', - + widget: 'select', visibleIf: { _$expand: (value: boolean) => value, }, @@ -261,11 +263,11 @@ export class DatatableOrderReportingComponent implements OnInit { */ initST() { this.columns = [ - { title: '', type: 'checkbox', className: 'text-center', width: '80px', }, - { title: '订单状态', index: 'name', className: 'text-center', width: '120px', }, - { title: '司机状态', index: 'name', className: 'text-center', width: '120px', }, - { title: '车辆状态', index: 'name', className: 'text-center', width: '120px', }, - { title: '本地校验', render: 'orderSn', className: 'text-center', width: '180px', }, + { title: '', type: 'checkbox', className: 'text-center', width: '60px', }, + { 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: '本地校验', render: 'localValid', className: 'text-center', width: '120px', }, { title: '订单号', render: 'billComplianceVOS', @@ -278,71 +280,50 @@ export class DatatableOrderReportingComponent implements OnInit { title: '网络货运人', render: 'serviceType', className: 'text-center', - width: '120px', + width: '180px', }, - { title: '统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '300px' }, - { title: '业务类型', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '300px' }, - { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '200px' }, - { title: '发货时间', render: 'driver', className: 'text-center', width: '150px' }, - { title: '收货时间', render: 'payeeName', className: 'text-center', width: '150px' }, + { 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: 'payeeName', className: 'text-center', width: '180px' }, { title: '托运人名称', render: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '托运人统一社会信用代码', index: 'loadingPlace', render: 'loadingPlace', className: 'text-center', width: '300px' }, - { title: '装货地址', index: 'dischargePlace', render: 'dischargePlace', className: 'text-center', width: '300px' }, - { title: '运单生成时间', render: 'goodsInfoVOList', className: 'text-center', width: '200px' }, + { 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: 'payeeName', className: 'text-center', width: '150px' }, - { title: '运费金额', render: 'transportInfo', className: 'text-center', width: '250px' }, + { title: '运费金额', render: 'amount', className: 'text-center', width: '250px' }, { 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: 'transportInfo', className: 'text-center', width: '250px' }, + { 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: 'transportInfo', className: 'text-center', width: '180px' }, { title: '实际承运人名称', render: 'payeeName', className: 'text-center', width: '150px' }, - { title: '实际承运人证件号码', render: 'transportInfo', className: 'text-center', width: '250px' }, + { 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: 'transportInfo', className: 'text-center', width: '250px' }, - { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '250px' }, - { - title: '操作', - width: '200px', - className: 'text-center', - buttons: [ - // { text: '编辑', click: (_record: any) => this.appeal(_record) }, - { - text: '申诉', - // click: (record) => this.appeal(record), - iif: (_record) => _record.representationsStatus === '1', - acl: { 'ability': ['RiskOrder-Appeal'] } - }, - { - text: '撤销申诉', - pop: { - title: '是否确定立即撤销申诉？', - okType: 'danger', - }, - click: (record) => this.recall(record), - iif: (_record) => _record.representationsStatus === '2', - acl: { 'ability': ['RiskOrder-CancleAppeal'] } - }, - { text: '详情', click: (_record: any) => this.view(_record), acl: { 'ability': ['RiskOrder-Detail'] } }, - ], - }, + { title: '上传次数', render: 'transportInfo', className: 'text-center', width: '150px' }, + { title: '上传时间', render: 'transportInfo', className: 'text-center', width: '180px' }, ]; } /** - * 删除单个实例 + *撤销 * @param record 记录实例 */ - recall(record: STData) { - this.service.request(this.service.$api_recall_reporting, { id: record?.id }).subscribe((res: any) => { + recall() { + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要撤回的数据'); + return; + } + + this.service.request(this.service.$api_recall_reporting, { rows: this.selectedRows }).subscribe((res: any) => { if (res) { - this.search({ representationsStatus: '' }); + this.search(); } }) @@ -390,7 +371,10 @@ export class DatatableOrderReportingComponent implements OnInit { * 上传 */ upload() { - + if (this.selectedRows.length === 0) { + this.openWainingModal('请选择需要上传的数据'); + return; + } } @@ -399,10 +383,46 @@ export class DatatableOrderReportingComponent implements OnInit { * @param params 上传设置 */ uploadSetting() { - + const modalRef = this.modal.create({ + nzTitle: '上传设置', + nzWidth: 600, + nzContent: DatatableReportingUploadSettingComponent, + nzComponentParams: {}, + nzFooter: null + }); + modalRef.afterClose.subscribe(res => { + }) } - search(params = {}) { + /** + * 查看校验结果 + */ + viewResult(item: any) { + const modalRef = this.modal.create({ + nzTitle: '校验结果', + nzWidth: 1200, + nzContent: DatatableReportingVerifyResultComponent, + nzComponentParams: { + record: item + }, + nzFooter: null + }); + modalRef.afterClose.subscribe(res => { + }) + } + + /** + * 查看监管审核结果 + */ + viewAuditResult(record: any) { + if (record?.billStatus !== '2') { + return; + } + this.openWainingModal('监管审核结果', record?.result) + } + + + search() { this.st.load(1); } @@ -413,4 +433,13 @@ export class DatatableOrderReportingComponent implements OnInit { this.service.exportStart(this.sf?.value, this.service.$api_async_export_order_reporting_list); } + openWainingModal(content: string, title = '提示') { + this.modal.warning({ + nzMask: false, + nzTitle: title, + nzContent: content, + }) + } + + } diff --git a/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.html b/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.html new file mode 100644 index 00000000..a4f5ae6e --- /dev/null +++ b/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.html @@ -0,0 +1,8 @@ + + +
+ + +
+ diff --git a/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.spec.ts b/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.spec.ts new file mode 100644 index 00000000..aeb5cf2c --- /dev/null +++ b/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableReportingUploadSettingComponent } from './upload-setting.component'; + +describe('DatatableReportingUploadSettingComponent', () => { + let component: DatatableReportingUploadSettingComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DatatableReportingUploadSettingComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableReportingUploadSettingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.ts b/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.ts new file mode 100644 index 00000000..b9f2d909 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/upload-setting/upload-setting.component.ts @@ -0,0 +1,109 @@ +import { Component, OnInit } from '@angular/core'; +import { SFSchema, SFUISchema } from '@delon/form'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { ReportingService } from '../../services/reporting.service'; + +@Component({ + selector: 'app-datatable-upload-setting', + templateUrl: './upload-setting.component.html', +}) +export class DatatableReportingUploadSettingComponent implements OnInit { + record: any = {}; + i: any = {}; + schema!: SFSchema; + ui!: SFUISchema; + + constructor( + private modal: NzModalRef, + public service: ReportingService + ) { } + + ngOnInit(): void { + this.initSF(); + // this.loadData(); + } + + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + no: { + type: 'string', + title: '订单数据', + enum: [ + { + label: '手动上传', + value: '1' + }, + { + label: '自动上传', + value: '2' + } + ], + description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传', + ui: { + widget: 'radio', + + } + }, + owner: { + type: 'string', + title: '资金数据', + enum: [ + { + label: '手动上传', + value: '1' + }, + { + label: '自动上传', + value: '2' + } + ], + description: '开启自动上传后，订单将在支付完成且风险单校验通过后自动上传', + ui: { + widget: 'radio', + + } + }, + }, + required: ['owner', 'no'], + } + this.ui = { + '*': { + spanLabelFixed: 100, + grid: { span: 24 }, + }, + }; + } + + /** + * 获取设置数据 + */ + loadData() { + this.service.request(this.service.$api_get_upload_setting, {}).subscribe(res => { + if (res) { + this.i = res; + + } + }) + } + + /** + * 修改 + * @param value + */ + save(value: any): void { + this.service.request(this.service.$api_upload_setting_save, { ...value }).subscribe(res => { + if (res) { + this.service.msgSrv.success('保存成功'); + this.modal.close(true); + } + }) + } + + close(): void { + this.modal.destroy(); + } +} diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html new file mode 100644 index 00000000..5136cd37 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.html @@ -0,0 +1,22 @@ +
+
+ + + +
+
+ + +
+
{{item.expenseName}}:{{item.price | currency}}
+
+ + +
+
+
+ + +
diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.spec.ts b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.spec.ts new file mode 100644 index 00000000..48b1e9e5 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { DatatableReportingVerifyResultComponent } from './verify-result.component'; + +describe('DatatableReportingVerifyResultComponent', () => { + let component: DatatableReportingVerifyResultComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [DatatableReportingVerifyResultComponent] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(DatatableReportingVerifyResultComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts new file mode 100644 index 00000000..3d52b397 --- /dev/null +++ b/src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts @@ -0,0 +1,85 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFSchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { NzModalRef } from 'ng-zorro-antd/modal'; +import { ReportingService } from '../../services/reporting.service'; + +@Component({ + selector: 'app-datatable-verify-result', + templateUrl: './verify-result.component.html', +}) +export class DatatableReportingVerifyResultComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + @ViewChild('st') private readonly st!: STComponent; + columns: STColumn[] = []; + record: any = {} + tabs: any[] = [ + { name: '订单信息', value: '1' }, + { name: '司机信息', value: '2' }, + { name: '车辆信息', value: '3' }, + ]; + + get reqParams() { + return {}; + } + constructor(public service: ReportingService, private modalRef: NzModalRef, public router: Router) { + + } + + ngOnInit(): void { + this.initST(); + } + + /** + * 初始化数据列表 + */ + initST() { + this.columns = [ + { title: '序号', type: 'no', className: 'text-center', width: '60px', }, + { title: '监管平台字段', index: 'orderStatus', className: 'text-center', width: '120px', }, + { title: '系统字段', index: 'orderStatus', className: 'text-center', width: '100px', }, + { title: '归属模块', index: 'orderStatus', className: 'text-center', width: '120px', }, + { title: '是否必填', index: 'orderStatus', className: 'text-center', width: '100px', }, + { title: '上传值', index: 'orderStatus', className: 'text-center', width: '150px', }, + { title: '本地校验', index: 'orderStatus', className: 'text-center', width: '100px', }, + { title: '错误内容', index: 'orderStatus', className: 'text-center', width: '150px', }, + ] + } + + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + + selectTab(e: any) { + + } + + update() { + if (this.record?.billType === '1') { + window.open(location.origin + `/#/order-management/vehicle-detailChange/${this.record?.id}`) + + } else if (this.record.billType === '2') { + window.open(location.origin + `/#/order-management/bulk-detailChange/${this.record?.id}`); + } + + + } + close(): void { + this.modalRef.destroy(); + } + + +} diff --git a/src/app/routes/datatable/reporting/services/reporting.service.ts b/src/app/routes/datatable/reporting/services/reporting.service.ts index 99a1cad7..1343c918 100644 --- a/src/app/routes/datatable/reporting/services/reporting.service.ts +++ b/src/app/routes/datatable/reporting/services/reporting.service.ts @@ -6,9 +6,11 @@ import { BaseService } from '@shared'; }) export class ReportingService extends BaseService { - $api_order_reporting_page = ``; // 订单上报列表 + $api_order_reporting_page = `/api/sdc/billOperate/listWholePage`; // 订单上报列表 $api_recall_reporting = ``; // 撤回 $api_async_export_order_reporting_list = ``; // 导出订单上报 + $api_get_upload_setting = ``; // 修改上传设置 + $api_upload_setting_save = ``; // 修改上传设置 constructor(public injector: Injector) { super(injector); } diff --git a/src/app/routes/datatable/services/data.service.ts b/src/app/routes/datatable/services/data.service.ts index 6cdb0e7f..95bc318c 100644 --- a/src/app/routes/datatable/services/data.service.ts +++ b/src/app/routes/datatable/services/data.service.ts @@ -23,10 +23,44 @@ export class DataService extends BaseService { // 查询运营报表 $api_listOperationalReportPage = `/api/sdc/report/listOperationalReportPage`; + // 查询业绩报表 + $api_listPerformanceReportPage = `/api/sdc/report/listPerformanceReportPage`; // 运营报表运单状态分布 $api_operationalReportWaybillStatusDistribution = `/api/sdc/report/operationalReportWaybillStatusDistribution`; - + // 获取网络货运人 + $api_get_network_freight_forwarder_list = `/api/mdc/cuc/networkTransporter/findAll`; + // 业绩报表柱状图 + $api_performanceReportHistogram = `/api/sdc/report/performanceReportHistogram`; constructor(public injector: Injector) { super(injector); } + + /** +* 获取网络货运人 +* @returns +*/ + getNetworkFreightForwarder(params = {}, containerAll = false) { + return this.request(this.$api_get_network_freight_forwarder_list, params).pipe( + map((res: any) => { + if (!res) { + return []; + } + const list = res.map((item: any) => { + return { + label: item.enterpriseName, + value: item.id + }; + }); + const obj = []; + if (containerAll) { + obj.push({ label: '全部', value: '' }); + } + return [...obj, ...list]; + }) + ); + } + + getPerformanceReportHistogram(params = {}){ + return this.request(this.$api_performanceReportHistogram, params) + } } 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 50746e93..464766ad 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 11:09:00 + * @LastEditTime : 2022-03-29 14:30:12 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -222,7 +222,7 @@
- + 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 d0da463c..816be5a7 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-03-23 14:44:43 + * @LastEditTime : 2022-03-29 14:30:11 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -65,14 +65,17 @@ export class OrderManagementBulkeDetailComponent implements OnInit { mapList:any[] = []; //地图点位数据组 addressItems:any[] = []; //打点地址数据组 constructor( - private route: ActivatedRoute, + public route: ActivatedRoute, private msgSrv: NzMessageService, private service: OrderManagementService, private router: Router, private modal: NzModalService - ) {} + ) { + } ngOnInit(): void { + console.log(this.route?.snapshot?.queryParams?.sts); + this.initData(); this.getTrajectory(); } diff --git a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html index 6868957d..63b15d6c 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-04 17:29:18 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:18:54 + * @LastEditTime : 2022-03-29 16:26:09 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint-detail\\complaint-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -21,7 +21,7 @@ -

投诉单号：{{datailList?.id}}

+

投诉单号：{{datailList?.complaintCode}}

diff --git a/src/app/routes/order-management/components/complaint/complaint.component.html b/src/app/routes/order-management/components/complaint/complaint.component.html index 6ced1c60..288f1e05 100644 --- a/src/app/routes/order-management/components/complaint/complaint.component.html +++ b/src/app/routes/order-management/components/complaint/complaint.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-03-23 10:11:08 + * @LastEditTime : 2022-03-29 16:13:40 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -21,10 +21,10 @@
-
+
-
+
+
+ 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! +
+
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
+
    +
  • 系统识别:{{item?.complianceTypeName}}
    • +
  • {{item?.determineDetails}}，您可在企业端提交申诉材料或联系客服。
    • +
  • 2021-11-07 03:20:15
    • +
+ + + + + + + + + + +
暂无附件信息
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 4bbe0ef8..2089b4f3 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-03-23 14:45:58 + * @LastEditTime : 2022-03-29 16:08:56 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -29,6 +29,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { mapList: any[] = []; //地图点位数据组 pois: any[] = []; addressItems: any[] = []; //打点地址数据组 + abnormalList: any[] = []; i: any = { unLoadingPlaceList: [], billExpenseDetails: [], @@ -66,7 +67,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { } ]; constructor( - private route: ActivatedRoute, + public route: ActivatedRoute, private msgSrv: NzMessageService, private service: OrderManagementService, private router: Router, @@ -102,6 +103,19 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); } }); + this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { + if (res) { + console.log('风险详情') + console.log(res) + this.abnormalList = res + } + }); + this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => { + if (res) { + console.log('异常预警') + console.log(res) + } + }); } // 取消订单 cancellation() { diff --git a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts index 2e47723a..7d1cafb2 100644 --- a/src/app/routes/partner/partner-list/components/index/partner-list.component.ts +++ b/src/app/routes/partner/partner-list/components/index/partner-list.component.ts @@ -71,6 +71,9 @@ export class PartnerListComponent { nzComponentParams: { info: { ...item, enterpriseName: item.enterpriseName || item.contactName }, sourcePage: '合伙人审核列表' }, nzFooter: null }); + modal.afterClose.subscribe(res => { + modal.destroy(); + }); } editTemplateAction(item: any) { @@ -102,6 +105,7 @@ export class PartnerListComponent { .subscribe(res => { if (res) { this.service.msgSrv.success('修改成功'); + this.st.load(1); this.nzModalService.closeAll(); } }); @@ -161,6 +165,7 @@ export class PartnerListComponent { if (res) { this.service.msgSrv.success('修改成功'); this.nzModalService.closeAll(); + this.st.load(1); } }); } @@ -185,6 +190,7 @@ export class PartnerListComponent { } else { this.service.msgSrv.warning('发起失败'); } + this.st.load(1); }); } }); diff --git a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts index 6e271d70..f6fbcaac 100644 --- a/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-audit-modal/partner-audit-modal.component.ts @@ -112,6 +112,7 @@ export class PartnerAuditModalComponent implements OnInit { }; this.service .request(this.service.$api_audit_partner, { + ...params, auditStatusEnum: params.auditStatusEnum, id: params.id, approvalOpinion: params.approvalOpinion, diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html index c4abbd48..dc271a74 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.html @@ -16,8 +16,8 @@

{{ detailData?.enterpriseName }}

- - + +
@@ -46,12 +46,12 @@ diff --git a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts index 61559772..b65e7695 100644 --- a/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/partner-detail/partner-detail.component.ts @@ -117,8 +117,10 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { freezeOrResume(type: number) { this.service.http .post(this.service.$api_lock_freight, { - id: this.route.snapshot.params.id, - statedLocked: !!type + appUserId: [this.detailData.appUserId], + freezeOrResume: !!type, + pageName: '合伙人详情', + telephone: this.detailData.adminUserInfo.mobile }) .subscribe(res => { if (res.data === true) { @@ -138,7 +140,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { const modal = this.nzModalService.create({ nzTitle: '审核', nzContent: PartnerAuditModalComponent, - nzComponentParams: { info: { ...this.detailData, isPass },sourcePage:'合伙人审核详情' }, + nzComponentParams: { info: { ...this.detailData, isPass }, sourcePage: '合伙人审核详情' }, nzFooter: null }); } @@ -274,7 +276,7 @@ export class PartnerDetailComponent implements OnInit, OnDestroy { operatingEndTime: this.datePipe.transform(dateil.operatingEndTime, 'yyyy-MM-dd'), operatingStartTime: this.datePipe.transform(dateil.operatingStartTime, 'yyyy-MM-dd') }); - + this.service.request(this.service.$api_save_entp_partner, params).subscribe(res => { if (res) { this.service.msgSrv.success('企业合伙人修改成功'); diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html index 96041864..b34aef70 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.html @@ -16,8 +16,8 @@

{{ detailData?.adminUserInfo?.name }}

- - + +
@@ -46,12 +46,12 @@ diff --git a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts index 6ee8f6d5..ce1cec65 100644 --- a/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts +++ b/src/app/routes/partner/partner-list/components/personal-partner-detail/personal-partner-detail.component.ts @@ -92,8 +92,10 @@ export class PersonalPartnerDetailComponent implements OnInit { freezeOrResume(type: number) { this.service.http .post(this.service.$api_lock_freight, { - id: this.route.snapshot.params.id, - statedLocked: !!type + appUserId: [this.detailData.appUserId], + freezeOrResume: !!type, + pageName: '合伙人详情', + telephone: this.detailData.adminUserInfo.mobile }) .subscribe(res => { if (res.data === true) { diff --git a/src/app/routes/partner/partner-list/services/partner-list.service.ts b/src/app/routes/partner/partner-list/services/partner-list.service.ts index 5a00d758..b714c47c 100644 --- a/src/app/routes/partner/partner-list/services/partner-list.service.ts +++ b/src/app/routes/partner/partner-list/services/partner-list.service.ts @@ -38,7 +38,7 @@ export class PartnerListService extends ShipperBaseService { // 渠道销售修改详情 $api_get_partner_change_list = '/api/mdc/partnerChannelRelLog/partnerChannelUpdateDetaiList'; // 冻结/启用企业业 - $api_lock_freight = '/api/mdc/cuc/enterpriseInfo/operate/lock'; + $api_lock_freight = '/api/mdc/cuc/userApp/freezeOrResume'; // 根据地区code查询列表 $api_get_region_by_code = '/api/mdc/pbc/region/getRegionByCode'; diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html index 50b366ea..2456985d 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-10 15:12:03 + * @LastEditTime : 2022-03-29 13:40:16 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -33,7 +33,7 @@ - -
1223
+ +
123212{{item?.abnormalFeedback}}
 diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts index 1f98579d..e1d2b4c3 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts @@ -32,30 +32,12 @@ export class ParterRebateManageMentRecordComponent implements OnInit { public shipperservice: ShipperBaseService, ) {} /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - /** * 查询参数 */ get reqParams() { const params: any = Object.assign({}, this.sf?.value || {}); - delete params._$expand; return { ...params, - deadlineTime: { - start: this.sf?.value?.deadlineTime?.[0] || '', - end: this.sf?.value?.deadlineTime?.[1] || '', - }, }; } ngOnInit() { @@ -66,7 +48,6 @@ export class ParterRebateManageMentRecordComponent implements OnInit { initSF() { this.schema = { properties: { - _$expand: { type: 'boolean', ui: { hidden: true } }, month: { type: 'string', title: '时间月份', @@ -90,7 +71,8 @@ export class ParterRebateManageMentRecordComponent implements OnInit { this.columns = [ { title: '月份', - index: 'name1' + index: 'month', + format: (item: any) => {return item?.month ? item?.month + '月' : ''} }, { title: '返佣金额（元）', @@ -98,7 +80,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit { }, { title: '合伙人名称', - index: 'name1' + index: 'partnerName' }, { title: '实际等级', @@ -106,7 +88,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit { }, { title: '管理费比例', - index: 'name1' + index: 'rebateRatio' }, { title: '返佣时间', @@ -114,7 +96,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit { }, { title: '异常反馈', - render: 'name44' + render: 'abnormalFeedback' }, { title: '操作', diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html index 251f9c00..5d636436 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 10:51:52 + * @LastEditTime : 2022-03-29 11:14:08 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -41,6 +41,7 @@ #st [data]="service.$api_get_rebateConfig" [columns]="columns" + [scroll]="{x: '1200px'}" [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] }" diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts index 795f64ee..ee9b5b9d 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts @@ -23,7 +23,6 @@ export class ParterRebateManageMentSettingComponent implements OnInit { sf!: SFComponent; spuStatus = '1'; _$expand = false; - data = [{ name1: 1111 }]; constructor( public router: Router, public ar: ActivatedRoute, @@ -32,30 +31,12 @@ export class ParterRebateManageMentSettingComponent implements OnInit { public shipperservice: ShipperBaseService, ) {} /** - * 查询字段个数 - */ - get queryFieldCount(): number { - return Object.keys(this.schema?.properties || {}).length; - } - /** - * 伸缩查询条件 - */ - expandToggle(): void { - this._$expand = !this._$expand; - this.sf?.setValue('/_$expand', this._$expand); - } - /** * 查询参数 */ get reqParams() { const params: any = Object.assign({}, this.sf?.value || {}); - delete params._$expand; return { ...params, - deadlineTime: { - start: this.sf?.value?.deadlineTime?.[0] || '', - end: this.sf?.value?.deadlineTime?.[1] || '', - }, }; } ngOnInit() { @@ -66,15 +47,22 @@ export class ParterRebateManageMentSettingComponent implements OnInit { initSF() { this.schema = { properties: { - _$expand: { type: 'boolean', ui: { hidden: true } }, - month: { + configName: { type: 'string', title: '配置名称', - format: 'configName', }, stateLocked: { type: 'string', - title: '状态' + title: '状态', + enum: [ + {label: '全部', value: ''}, + {label: '启用', value: 0}, + {label: '禁用', value: 1}, + ], + ui: { + widget: 'select', + }, + }, } }; @@ -90,35 +78,44 @@ export class ParterRebateManageMentSettingComponent implements OnInit { this.columns = [ { title: '配置名称', - index: 'configName' + index: 'configName', + width: '200px', }, { title: '配置类型', - render: 'configType' + render: 'configType', + width: '200px', + }, { title: '备注', - index: 'remark' + index: 'remark', + width: '250px', }, { title: '关联合伙人范围', - render: 'partnerType' + render: 'partnerType', + width: '200px', }, { title: '创建时间', - index: 'enableTime' + index: 'enableTime', + width: '200px', }, { title: '启用时间', - index: 'enableTime' + index: 'enableTime', + width: '200px', }, { title: '优先级', - index: 'priority' + index: 'priority', + width: '100px', }, { title: '状态', - render: 'stateLocked' + render: 'stateLocked', + width: '100px', }, { title: '操作', diff --git a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts index 2e68c860..fd12644c 100644 --- a/src/app/routes/partner/rebate-management/services/rebate-management.service.ts +++ b/src/app/routes/partner/rebate-management/services/rebate-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-10 11:19:00 * @LastEditors : Shiming - * @LastEditTime : 2022-03-10 13:51:05 + * @LastEditTime : 2022-03-29 11:26:38 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\services\\rebate-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -23,6 +23,10 @@ export class RebateManagementService extends BaseService { public $api_save_rebateConfig = '/api/mdc/rebateConfig/save'; // 启用/禁用返佣配置 public $api_set_updateRebateConfig = '/api/mdc/rebateConfig/updateRebateConfig'; + + + // 运营端查询合伙人返佣 + public $api_get_getIncomeByBillpage = '/api/bpc/partnerIncomeHead/getIncomeByBillpage';   // 查询合伙人信息-分页 public $api_get_partner_page = '/api/mdc/partner/list/page'; constructor(public injector: Injector) { diff --git a/src/app/shared/services/business/shipper-base.service.ts b/src/app/shared/services/business/shipper-base.service.ts index bba9056d..045ca354 100644 --- a/src/app/shared/services/business/shipper-base.service.ts +++ b/src/app/shared/services/business/shipper-base.service.ts @@ -297,7 +297,7 @@ export class ShipperBaseService extends BaseService { map(res => { if (res) { return res.map((m: any) => { - return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.userAppId }; + return { label: `${m.employeeVO?.empName}/${m.employeeVO?.mobile}`, value: m.id }; }); } else { return []; diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 824190d8..69601b29 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -646,8 +646,32 @@ { "text": "订单上报", "link": "/datatable/reporting/order" + }, + { + "text": "合规监控报表", + "children": [{ + "text": "合规监控报表", + "link": "/datatable/compliancetabel/index" + }, + { + "text": "业务员-合规报表", + "link": "/datatable/compliancetabel/salesman" + }, + { + "text": "客户-合规报表", + "link": "/datatable/compliancetabel/customer" + } + ] + }, + { + "text": "财务报表", + "link": "/datatable/financetable" + }, + { + "text": "开票数据报表", + "link": "/datatable/invoicetable" } - ] + ] } ] }]