Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
潘晓云
2022-03-09 16:38:15 +08:00
parent b0a7611ae4 737cfd55bb
commit 7550e9ceae
10 changed files with 443 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/routes/partner/partner-routing.module.ts
View File

@ -17,12 +17,12 @@ import { ParterChannelSalesEditComponent } from './channel-sales/components/edit
import { ParterChannelSalesListComponent } from './channel-sales/components/list/list.component';
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 { ParterRebateManageMentParticularsComponent } from './rebate-management/components/particulars/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';
import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
import { PartnerAccountManagementVirtualAccountDetailComponent } from './account-management/components/virtual-account-detail/virtual-account-detail.component';
import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
const routes: Routes = [
{
@ -57,6 +57,7 @@ const routes: Routes = [
path: 'rebate',
children: [
{ path: 'particulars', component: ParterRebateManageMentParticularsComponent },
{ path: 'record', component: ParterRebateManageMentRecordComponent },
]
},
{

14
src/app/routes/partner/partner.module.ts
View File

@ -1,3 +1,13 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-09 14:34:55
* @LastEditors : Shiming
* @LastEditTime : 2022-03-09 14:56:46
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { SharedModule } from '@shared';
@ -11,12 +21,13 @@ import { PartnerPartnerStatisticsComponent } from './business-statistics/compone
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';
import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/list/particulars.component';
import { ParterRebateManageMentParticularsComponent } from './rebate-management/components/particulars/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';
import { PartnerPartnerOrderDetailComponent } from './business-statistics/components/partner-order-detail/partner-order-detail.component';
import { PartnerAccountManagementListComponent } from './account-management/components/list/list.component';
import { PartnerAccountManagementVirtualAccountDetailComponent } from './account-management/components/virtual-account-detail/virtual-account-detail.component';
import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
const COMPONENTS: any[] = [
PartnerBusinessStatisticsIndexComponent,
@ -30,6 +41,7 @@ const COMPONENTS: any[] = [
PartnerPartnerCustomDetailComponent,
PartnerSaleCustomDetailComponent,
ParterRebateManageMentParticularsComponent,
ParterRebateManageMentRecordComponent,
PartnerSalePartnerDetailComponent,
PartnerPartnerCustomOrderDetailComponent,
PartnerPartnerOrderDetailComponent,

0
src/app/routes/partner/rebate-management/components/list/particulars.component.html → src/app/routes/partner/rebate-management/components/particulars/particulars.component.html
View File

6
src/app/routes/partner/rebate-management/components/list/particulars.component.ts → src/app/routes/partner/rebate-management/components/particulars/particulars.component.ts
View File

@ -136,7 +136,7 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
index: 'name1'
},
{
title: '返佣金额（元）',
title: '预估返佣金额（元）',
index: 'name1'
},
{
@ -152,11 +152,11 @@ export class ParterRebateManageMentParticularsComponent implements OnInit {
index: 'name1'
},
{
title: '合伙人名称',
title: '销售渠道',
index: 'name1'
},
{
title: '网络货运人',
title: '合伙人名称',
index: 'name1'
},
{

45
src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html Normal file
View File

@ -0,0 +1,45 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
* @LastEditTime : 2022-03-09 15:04:50
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''"> </page-header-wrapper>
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
[button]="'none'"
></sf>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1);">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" >导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
</div>
</div>
</nz-card>
<nz-card>
<!-- 数据列表 -->
<st
#st
[data]="data"
[columns]="columns"
[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] }"
[loadingDelay]="500"
[loading]="service.http.loading"
>
</st>
</nz-card>

151
src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts Normal file
View File

@ -0,0 +1,151 @@
import { ModalHelper } from '@delon/theme';
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { processSingleSort, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { RebateManagementService } from '../../services/rebate-management.service';
import { ParterRebateManageMenRecordDetailComponent } from '../../model/record-detail/record-detail.component';
@Component({
selector: 'app-parter-channel-rebate-management-record',
templateUrl: './rebate-record.component.html'
})
export class ParterRebateManageMentRecordComponent implements OnInit {
schema: SFSchema = {};
columns!: STColumn[];
ui!: SFUISchema;
@ViewChild('st', { static: false })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
spuStatus = '1';
_$expand = false;
data = [{ name1: 1111 }];
constructor(
public router: Router,
public ar: ActivatedRoute,
public service: RebateManagementService,
private modalService: NzModalService,
public shipperservice: ShipperBaseService,
private modal: ModalHelper
) {}
/**
* 查询字段个数
*/
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() {
this.initSF();
this.initST();
}
initSF() {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
month: {
type: 'string',
title: '时间月份',
format: 'month',
},
phone: {
type: 'string',
title: '合伙人名称'
},
}
};
this.ui = {
'*': {
spanLabelFixed: 140,
grid: { span: 8, gutter: 4 }
}
};
}
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: '操作',
fixed: 'right',
width: '90px',
className: 'text-left',
buttons: [
{
text: '明细',
click: _record => this.viewEvaluate(_record),
}
]
}
];
}
/**
*查看详情
*/
viewEvaluate(item: any) {
// this.modalService
this.modal.createStatic(ParterRebateManageMenRecordDetailComponent, {i:item}).subscribe((res: boolean)=> {
if(res) {
}
})
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
this.st.load(1);
}
}

34
src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html Normal file
View File

@ -0,0 +1,34 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
* @LastEditTime : 2022-03-09 15:14:50
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\record-detail\\record-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div nz-row nzGutter="8">
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
[button]="'none'"
></sf>
</div>
<!-- 数据列表 -->
<st
#st
[bordered]="true"
[data]="data"
[columns]="columns"
[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] }"
[loadingDelay]="500"
[loading]="service.http.loading"
>
</st>

189
src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts Normal file
View File

@ -0,0 +1,189 @@
import { ModalHelper } from '@delon/theme';
import { Component, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st';
import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { processSingleSort, ShipperBaseService } from '@shared';
import { NzModalService } from 'ng-zorro-antd/modal';
import { RebateManagementService } from '../../services/rebate-management.service';
@Component({
selector: 'app-parter-channel-rebate-management-record-detail',
templateUrl: './record-detail.component.html'
})
export class ParterRebateManageMenRecordDetailComponent implements OnInit {
schema: SFSchema = {};
columns!: STColumn[];
ui!: SFUISchema;
@ViewChild('st', { static: false })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
spuStatus = '1';
_$expand = false;
data = [{ name1: 1111 }];
constructor(
public router: Router,
public ar: ActivatedRoute,
public service: RebateManagementService,
private modalService: NzModalService,
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() {
this.initSF();
this.initST();
}
initSF() {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
name: {
type: 'string',
title: '订单号'
},
phone: {
type: 'string',
title: '付款单号'
},
phone2: {
type: 'string',
title: '下单客户'
},
enterpriseInfoId: {
type: 'string',
title: '网络货运人',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value
},
allowClear: true,
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
},
phone3: {
type: 'string',
title: '合伙人名称',
ui: {
visibleIf: {
_$expand: (value: boolean) => value
},
}
},
deadlineTime: {
title: '时间范围',
type: 'string',
ui: {
widget: 'date',
mode: 'range',
format: 'yyyy-MM-dd',
visibleIf: {
_$expand: (value: boolean) => value
},
allowClear: true
} as SFDateWidgetSchema
}
}
};
this.ui = {
'*': {
spanLabelFixed: 140,
grid: { span: 8, gutter: 4 }
}
};
}
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'
},
{
title: '合伙人名称',
index: 'name1'
},
{
title: '合伙人等级',
index: 'name1'
},
{
title: '管理费比例',
index: 'name1'
},
{
title: '固定结算费率',
index: 'name1'
},
{
title: '返佣时间',
index: 'name1'
}
];
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
this.st.load(1);
}
}

6
src/app/routes/supply-management/supply-management.module.ts
View File

@ -4,13 +4,14 @@
* @Author : Shiming
* @Date : 2021-12-20 10:13:02
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:26:40
* @LastEditTime : 2022-03-09 14:53:50
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\supply-management.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule, Type } from '@angular/core';
import { SharedModule } from '@shared';
import { ParterRebateManageMenRecordDetailComponent } from '../partner/rebate-management/model/record-detail/record-detail.component';
import { CarAddDriverComponent } from './components/add-driver/add-driver.component';
import { SupplyManagementAddDriversComponent } from './components/add-drivers/add-drivers.component';
import { CarAddmodalComponent } from './components/addmodal/addmodal.component';
@ -61,7 +62,8 @@ const COMPONENTS: Type<void>[] = [
SupplyManagementReleasePublishComponent,
SupplyManagementBulkReleasePublishComponent,
TranAgreementComponent,
SupplyManagementBulkAssignedCarComponent
SupplyManagementBulkAssignedCarComponent,
ParterRebateManageMenRecordDetailComponent
];
@NgModule({

2
src/assets/mocks/menu-data.json
View File

@ -525,7 +525,7 @@
},
{
"text": "返佣记录",
"link": "/partner/rebate/"
"link": "/partner/rebate/record"
}
]
},