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 new file mode 100644 index 00000000..df667e4f --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.html @@ -0,0 +1,42 @@ + + + + + + +
+
+ +
+
+

{{detailInfo?.company}}

+
+ {{detailInfo?.code}} + {{detailInfo?.proxy}} +
+
+ 添加时间：{{detailInfo?.createTime}} + 所属城市：{{detailInfo?.belongCity}} +
+
+
+
+
+
+
+ +
+
+ + + +
+
+ + + + + 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 new file mode 100644 index 00000000..7372f925 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.less @@ -0,0 +1,11 @@ +:host { + .user-logo { + width: 90px; + } + + .letf-box { + width: 250px; + display: inline-block; + } + +} diff --git a/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.spec.ts b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.spec.ts new file mode 100644 index 00000000..4fddfb5d --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { PartnerPartnerCustomDetailComponent } from './partner-custom-detail.component'; + +describe('PartnerPartnerCustomDetailComponent', () => { + let component: PartnerPartnerCustomDetailComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ PartnerPartnerCustomDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PartnerPartnerCustomDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); 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 new file mode 100644 index 00000000..c48476d9 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/partner-custom-detail/partner-custom-detail.component.ts @@ -0,0 +1,132 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { BussinessStatisticsService } from '../../services/bussiness-statistics.service'; + +@Component({ + selector: 'app-partner-partner-custom-detail', + templateUrl: './partner-custom-detail.component.html', + styleUrls: ['./partner-custom-detail.component.less'] +}) +export class PartnerPartnerCustomDetailComponent implements OnInit { + schema: SFSchema = {}; + ui!: SFUISchema; + detailInfo: any = { + logo: './assets/images/user/logo.svg', + company: '张三', + code: '91440300357887492H', + proxy: '企业合伙人', + belongCity: '深圳、上海、北京', + createTime: '2021-09-23 14:43:31' + } + @ViewChild('st') private readonly st!: STComponent; + @ViewChild('sf') private readonly sf!: SFComponent; + 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' }, + ] + } + ]; + _$expand = false; + + constructor(public service: BussinessStatisticsService) { + + } + + ngOnInit(): void { + this.initST(); + this.initSF(); + } + + resetSF() { + this._$expand = false; + this.sf.reset() + } + /** +* 伸缩查询条件 +*/ + expandToggle() { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + + add(): void { + // this.modal + // .createStatic(FormEditComponent, { i: { id: 0 } }) + // .subscribe(() => this.st.reload()); + } + search() { + this.st.load(1); + } + export() { + + } + + initSF() { + this.schema = { + properties: { + abnormalCause: { + title: '客户名称', + type: 'string', + ui: { + placeholder: '请输入', + }, + }, + abnormalCause1: { + title: '客户状态', + type: 'string', + default: '', + enum: [ + { + label: '全部', + value: '' + }, + { + label: '个人', + value: '1' + }, + { + label: '企业', + value: '2' + } + ], + ui: { + widget: 'select' + }, + }, + } + } + this.ui = { + '*': { spanLabelFixed: 100, grid: { span: 11, gutter: 4 } }, + }; + } + /** + * 初始化数据列表 + */ + 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 }, + ]; + } + + goBack() { + window.history.go(-1); + } + +} 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 8dd7ef1a..d6240182 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 @@ -1,24 +1,24 @@ - + - + - {{item.approvalStatus}} + {{item.yskmoney}}
{{item.approvalStatus1 | currency:' '}}
 -
{{item.approvalStatus1 | currency:' '}}
+ {{item.yskmoney | currency:' '}} -
{{item.approvalStatus1 | currency:' '}}
+
{{item.yskmoney | currency:' '}}
 -
{{item.approvalStatus1 | currency:' '}}
+
{{item.armoney | 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 ad508c7d..db1de887 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 @@ -1,7 +1,8 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { STColumn, STComponent } from '@delon/abc/st'; -import { SFSchema, SFUISchema } from '@delon/form'; +import { SFComponent, SFSchema, SFUISchema } from '@delon/form'; import { ModalHelper, _HttpClient } from '@delon/theme'; +import { BussinessStatisticsService } from '../../services/bussiness-statistics.service'; @Component({ selector: 'app-partner-partner-statistics', @@ -12,9 +13,10 @@ export class PartnerPartnerStatisticsComponent implements OnInit { schema!: SFSchema; ui!: SFUISchema; @ViewChild('st') private readonly st!: STComponent; + @ViewChild('sf') private readonly sf!: SFComponent; columns: STColumn[] = []; - constructor(private http: _HttpClient, private modal: ModalHelper) { } + constructor(public service: BussinessStatisticsService) { } ngOnInit(): void { this.initSF(); @@ -65,15 +67,19 @@ export class PartnerPartnerStatisticsComponent implements OnInit { { title: '合伙人名称', index: 'carNo', className: 'text-center' }, { title: '类型', render: 'carModelLabel', className: 'text-center' }, { title: '注册时间', index: 'carNo', className: 'text-center' }, - { title: '本月新增客户', render: 'approvalStatus', className: 'text-center', sort: true }, + { 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 }, - ]; } + resetSF() { + this.sf.reset(); + this.st.reset(); + } + } diff --git a/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.html b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.html new file mode 100644 index 00000000..b376f70a --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.html @@ -0,0 +1,27 @@ + + + + + + + + + + + + diff --git a/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.spec.ts b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.spec.ts new file mode 100644 index 00000000..d88e4632 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { PartnerSaleCustomDetailComponent } from './sale-custom-detail.component'; + +describe('PartnerSaleCustomDetailComponent', () => { + let component: PartnerSaleCustomDetailComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ PartnerSaleCustomDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(PartnerSaleCustomDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.ts b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.ts new file mode 100644 index 00000000..c3a63716 --- /dev/null +++ b/src/app/routes/partner/business-statistics/components/sale-custom-detail/sale-custom-detail.component.ts @@ -0,0 +1,53 @@ +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-custom-detail', + templateUrl: './sale-custom-detail.component.html', +}) +export class PartnerSaleCustomDetailComponent implements OnInit { + url = `/user`; + searchSchema: SFSchema = { + properties: { + no: { + type: 'string', + title: '编号' + } + } + }; + detailInfo: any = { + logo: './assets/images/user/logo.svg', + name: '张三', + phone: '1399999999', + proxy: '城市代理', + level: '二级', + createTime: '添加时间' + } + @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/services/bussiness-statistics.service.ts b/src/app/routes/partner/business-statistics/services/bussiness-statistics.service.ts new file mode 100644 index 00000000..894da58b --- /dev/null +++ b/src/app/routes/partner/business-statistics/services/bussiness-statistics.service.ts @@ -0,0 +1,13 @@ +import { Injectable, Injector } from '@angular/core'; +import { BaseService } from '@shared'; + +@Injectable({ + providedIn: 'root' +}) +export class BussinessStatisticsService extends BaseService { + + $api_get_partner_statistics_page = `/api/fcc/ficoBrmH/list/page`; + constructor(public injector: Injector) { + super(injector); + } +} diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts index 5de586a3..37df1da1 100644 --- a/src/app/routes/partner/partner-routing.module.ts +++ b/src/app/routes/partner/partner-routing.module.ts @@ -1,13 +1,14 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component'; -import { PartnerPartnerStatisticsComponent } from './business-statistics/components/partner-statistics/partner-statistics.component'; -import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component'; +import { PartnerPartnerCustomDetailComponent } from './business-statistics/components/partner-custom-detail/partner-custom-detail.component'; +import { PartnerSaleCustomDetailComponent } from './business-statistics/components/sale-custom-detail/sale-custom-detail.component'; const routes: Routes = [ { path: 'business-statistics/index', component: PartnerBusinessStatisticsIndexComponent }, - { path: 'partner-statistics', component: PartnerPartnerStatisticsComponent }, - { path: 'sale-statistics', component: PartnerSaleStatisticsComponent }]; + { path: 'sale-custom/detail/:id', component: PartnerSaleCustomDetailComponent }, + { path: 'partner-custom/detail/:id', component: PartnerPartnerCustomDetailComponent }, +]; @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts index ec2a3f5c..d42eba8c 100644 --- a/src/app/routes/partner/partner.module.ts +++ b/src/app/routes/partner/partner.module.ts @@ -5,11 +5,16 @@ import { PartnerRoutingModule } from './partner-routing.module'; import { PartnerBusinessStatisticsIndexComponent } from './business-statistics/components/index/index.component'; import { PartnerPartnerStatisticsComponent } from './business-statistics/components/partner-statistics/partner-statistics.component'; import { PartnerSaleStatisticsComponent } from './business-statistics/components/sale-statistics/sale-statistics.component'; +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'; const COMPONENTS: any[] = [ PartnerBusinessStatisticsIndexComponent, PartnerPartnerStatisticsComponent, - PartnerSaleStatisticsComponent]; + PartnerSaleStatisticsComponent, + PartnerPartnerCustomDetailComponent, + PartnerPartnerCustomDetailComponent, + PartnerSaleCustomDetailComponent]; @NgModule({ declarations: [...COMPONENTS], imports: [CommonModule, PartnerRoutingModule, SharedModule] diff --git a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html index 017f5691..c88df339 100644 --- a/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html +++ b/src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html @@ -8,7 +8,7 @@