From d370708e980fca9688736b5dcfd17be0a34373d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Thu, 24 Feb 2022 20:10:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/index/index.component.html | 2 +- .../components/index/index.component.ts | 4 +- .../partner-custom-detail.component.html | 5 ++- .../partner-custom-detail.component.less | 2 +- .../partner-custom-detail.component.ts | 41 +++++++++++++---- ...partner-custom-order-detail.component.html | 9 ++++ ...tner-custom-order-detail.component.spec.ts | 24 ++++++++++ .../partner-custom-order-detail.component.ts | 45 +++++++++++++++++++ .../partner-statistics.component.html | 2 +- .../partner-statistics.component.ts | 1 + .../sale-partner-detail.component.html | 9 ++++ .../sale-partner-detail.component.spec.ts | 24 ++++++++++ .../sale-partner-detail.component.ts | 45 +++++++++++++++++++ .../routes/partner/partner-routing.module.ts | 16 ++++--- src/app/routes/partner/partner.module.ts | 6 ++- 15 files changed, 212 insertions(+), 23 deletions(-) create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.spec.ts create mode 100644 src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts create mode 100644 src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.html create mode 100644 src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.spec.ts create mode 100644 src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.ts diff --git a/src/app/routes/partner/business-statistics/components/index/index.component.html b/src/app/routes/partner/business-statistics/components/index/index.component.html index fa15bb93..5074b929 100644 --- a/src/app/routes/partner/business-statistics/components/index/index.component.html +++ b/src/app/routes/partner/business-statistics/components/index/index.component.html @@ -2,7 +2,7 @@ - + diff --git a/src/app/routes/partner/business-statistics/components/index/index.component.ts b/src/app/routes/partner/business-statistics/components/index/index.component.ts index 96ffd6d5..a39d1fa2 100644 --- a/src/app/routes/partner/business-statistics/components/index/index.component.ts +++ b/src/app/routes/partner/business-statistics/components/index/index.component.ts @@ -26,9 +26,7 @@ export class PartnerBusinessStatisticsIndexComponent implements OnInit { constructor() { } - change(e: any) { - console.log(this.selectedIndex); - } + ngOnInit(): void { } diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html index df667e4f..f64e394c 100644 --- a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html +++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html @@ -38,5 +38,8 @@ - + diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less index 7372f925..06c7da1f 100644 --- a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less +++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less @@ -4,8 +4,8 @@ } .letf-box { - width: 250px; display: inline-block; + width: 250px; } } diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts index c48476d9..57a8d4f4 100644 --- a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts +++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts @@ -41,6 +41,10 @@ export class PartnerPartnerCustomDetailComponent implements OnInit { } + get reqParams() { + return { ...this.sf?.value }; + } + ngOnInit(): void { this.initST(); this.initSF(); @@ -113,18 +117,37 @@ export class PartnerPartnerCustomDetailComponent implements OnInit { */ initST() { this.columns = [ - { title: '合伙人名称', index: 'carNo', className: 'text-center' }, - { title: '类型', render: 'carModelLabel', className: 'text-center' }, - { title: '注册时间', index: 'carNo', className: 'text-center' }, - { title: '本月新增客户', render: 'approvalStatus0', className: 'text-center', sort: true }, - { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true }, - { title: '本月已结算金额（元）', render: 'approvalStatus1', className: 'text-center', sort: true }, - { title: '累计已结算金额（元）', render: 'approvalStatus2', className: 'text-center', sort: true }, - { title: '本月预估收益（元）', render: 'approvalStatus3', className: 'text-center', sort: true }, - { title: '累计收益（元）', render: 'approvalStatus4', className: 'text-center', sort: true }, + { title: '客户名称', index: 'carNo', className: 'text-center', width: 150 }, + { title: '客户状态', render: 'carModelLabel', className: 'text-center', width: 120 }, + { title: '结算时间段', index: 'carNo', className: 'text-center', width: 200 }, + { title: '本月交易数', render: 'approvalStatus0', className: 'text-center', sort: true, width: 150 }, + { title: '客户总数', render: 'approvalStatus', className: 'text-center', sort: true, width: 150 }, + { title: '累计交易数', render: 'approvalStatus1', className: 'text-center', sort: true, width: 120 }, + { title: '本月已结算订单', render: 'approvalStatus2', className: 'text-center', sort: true, width: 180 }, + { title: '累计已结算订单', render: 'approvalStatus3', className: 'text-center', sort: true, width: 180 }, + { title: '本月交易金额（元）', index: 'approvalStatus5', className: 'text-right', sort: true, type: 'currency', width: 180 }, + { title: '累计交易金额（元）', index: 'approvalStatus6', className: 'text-right', sort: true, type: 'currency', width: 180 }, + { title: '本月已结算金额（元）', index: 'approvalStatus7', className: 'text-right', sort: true, type: 'currency', width: 200 }, + { title: '累计已结算金额（元）', index: 'approvalStatus8', className: 'text-right', sort: true, type: 'currency', width: 200 }, + { title: '本月已开票金额（元）', index: 'approvalStatus9', className: 'text-right', sort: true, type: 'currency', width: 200 }, + { title: '累计已开票金额（元）', index: 'approvalStatus10', className: 'text-right', sort: true, type: 'currency', width: 200 }, + { title: '本月申请开票金额（元）', index: 'approvalStatus11', className: 'text-right', sort: true, type: 'currency', width: 200 }, + { + title: '操作', + width: 150, + buttons: [ + { + text: '查看订单明细', + click: (_record) => this.viewOrderDetail(_record) + } + ] + }, ]; } + viewOrderDetail(record: any) { + + } goBack() { window.history.go(-1); } diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html new file mode 100644 index 00000000..482ccb06 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.spec.ts b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.spec.ts new file mode 100644 index 00000000..dc51f832 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { PartnerPartnerCustomOrderDetailComponent } from './partner-custom-order-detail.component'; + +describe('PartnerPartnerCustomOrderDetailComponent', () => { + let component: PartnerPartnerCustomOrderDetailComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ PartnerPartnerCustomOrderDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PartnerPartnerCustomOrderDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component.ts new file mode 100644 index 00000000..11ecb65c --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.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-partner-partner-custom-order-detail', + templateUrl: './partner-custom-order-detail.component.html', +}) +export class PartnerPartnerCustomOrderDetailComponent 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/partner/business-statistics/components/partner-statistics/partner-statistics.component.html b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html index d6240182..70f3e8ba 100644 --- a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html +++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.html @@ -5,7 +5,7 @@ - {{item.yskmoney}} + {{item.yskmoney}}
{{item.approvalStatus1 | currency:' '}}
diff --git a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts index db1de887..ffb9d09c 100644 --- a/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts +++ b/src/app/routes/partner/business-statistics/components/partner-statistics/partner-statistics.component.ts @@ -82,4 +82,5 @@ export class PartnerPartnerStatisticsComponent implements OnInit { } + } diff --git a/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.html b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.html new file mode 100644 index 00000000..482ccb06 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.spec.ts b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.spec.ts new file mode 100644 index 00000000..673661d9 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { PartnerSalePartnerDetailComponent } from './sale-partner-detail.component'; + +describe('PartnerSalePartnerDetailComponent', () => { + let component: PartnerSalePartnerDetailComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ PartnerSalePartnerDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PartnerSalePartnerDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.ts b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.component.ts new file mode 100644 index 00000000..229daf8d --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/sale-partner-detail/sale-partner-detail.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-partner-sale-partner-detail', + templateUrl: './sale-partner-detail.component.html', +}) +export class PartnerSalePartnerDetailComponent 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/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts index e45e7358..017a9f27 100644 --- a/src/app/routes/partner/partner-routing.module.ts +++ b/src/app/routes/partner/partner-routing.module.ts @@ -18,14 +18,20 @@ import { ParterChannelSalesListComponent } from './channel-sales/components/list import { ParterLevelConfigEditComponent } from './level-config/components/edit/edit.component'; import { ParterLevelConfigListComponent } from './level-config/components/list/list.component'; import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component'; +import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component'; +import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component'; const routes: Routes = [ { - path: 'business-statistics', children: [ + path: 'business-statistics', + children: [ { path: '', redirectTo: 'index' }, { path: 'index', component: PartnerBusinessStatisticsIndexComponent }, - { path: 'sale-custom/detail/:id', component: PartnerSaleCustomDetailComponent }, - { path: 'partner-custom/detail/:id', component: PartnerPartnerCustomDetailComponent }, + { path: 'partner/order-detail/:id', component: PartnerPartnerCustomOrderDetailComponent }, + { path: 'partner/custom-detail/:id', component: PartnerPartnerCustomDetailComponent }, + { path: 'partner/custom-order-detail/:id', component: PartnerPartnerCustomOrderDetailComponent }, + { path: 'sale/custom-detail/:id', component: PartnerSaleCustomDetailComponent }, + { path: 'sale/partner-detail/:id', component: PartnerSalePartnerDetailComponent }, ] }, { @@ -49,9 +55,7 @@ const routes: Routes = [ children: [ { path: 'particulars', component: ParterRebateManageMentParticularsComponent }, ] - }, - -]; + }]; @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts index e0de725e..ed9b3d2a 100644 --- a/src/app/routes/partner/partner.module.ts +++ b/src/app/routes/partner/partner.module.ts @@ -12,6 +12,8 @@ import { PartnerSaleStatisticsComponent } from './business-statistics/components import { PartnerSaleCustomDetailComponent } from './business-statistics/components/sale-custom-detail/sale-custom-detail.component'; import { PartnerPartnerCustomDetailComponent } from './business-statistics/components/partner-custom-detail/partner-custom-detail.component'; import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component'; +import { PartnerSalePartnerDetailComponent } from './business-statistics/components/sale-partner-detail/sale-partner-detail.component'; +import { PartnerPartnerCustomOrderDetailComponent } from './business-statistics/components/partner-custom-order-detail/partner-custom-order-detail.component'; const COMPONENTS: any[] = [ PartnerBusinessStatisticsIndexComponent, @@ -24,7 +26,9 @@ const COMPONENTS: any[] = [ PartnerPartnerCustomDetailComponent, PartnerPartnerCustomDetailComponent, PartnerSaleCustomDetailComponent, - ParterRebateManageMentParticularsComponent + ParterRebateManageMentParticularsComponent, + PartnerSalePartnerDetailComponent, + PartnerPartnerCustomOrderDetailComponent ]; @NgModule({