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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-03-10 15:40:52 +08:00
parent 7406f1234a
commit 15937316dd
10 changed files with 379 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@ import { PartnerAccountManagementAccountDetailComponent } from './account-manage
import { PartnerAccountManagementRecordedDetailComponent } from './account-management/components/recorded-detail/recorded-detail.component';
import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
import { ParterRebateManageMentSettingComponent } from './rebate-management/components/rebate-setting/rebate-setting.component';
const routes: Routes = [
{
@ -65,6 +66,7 @@ const routes: Routes = [
children: [
{ path: 'particulars', component: ParterRebateManageMentParticularsComponent },
{ path: 'record', component: ParterRebateManageMentRecordComponent },
{ path: 'setting', component: ParterRebateManageMentSettingComponent },
]
},
{

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

@ -40,6 +40,8 @@ import { PartnerAccountManagementRecordedDetailComponent } from './account-manag
import { PartnerAccountManagementWithdrawalsRecordComponent } from './account-management/components/withdrawals-record/withdrawals-record.component';
import { PartnerAccountManagementWithdrawalsDetailComponent } from './account-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component';
import { ParterRebateManageMentRecordComponent } from './rebate-management/components/rebate-record/rebate-record.component';
import { ParterRebateManageMenAbnormalFeedbackComponent } from './rebate-management/model/abnormal-feedback/abnormal-feedback.component';
import { ParterRebateManageMentSettingComponent } from './rebate-management/components/rebate-setting/rebate-setting.component';
const COMPONENTS: any[] = [
PartnerBusinessStatisticsIndexComponent,
@ -69,7 +71,9 @@ const COMPONENTS: any[] = [
PartnerAccountManagementAccountDetailComponent,
PartnerAccountManagementRecordedDetailComponent,
PartnerAccountManagementWithdrawalsRecordComponent,
PartnerAccountManagementWithdrawalsDetailComponent
PartnerAccountManagementWithdrawalsDetailComponent,
ParterRebateManageMenAbnormalFeedbackComponent,
ParterRebateManageMentSettingComponent
];
@NgModule({

5
src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
* @LastEditTime : 2022-03-09 15:04:50
* @LastEditTime : 2022-03-10 15:12:03
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -41,5 +41,8 @@
[loadingDelay]="500"
[loading]="service.http.loading"
>
<ng-template st-row='name44' let-item let-index='index'>
<div style="color: #f59a23;" (click)="feedback()">1223</div>
</ng-template>
</st>
</nz-card>

37
src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
View File

@ -7,6 +7,7 @@ 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';
import { ParterRebateManageMenAbnormalFeedbackComponent } from '../../model/abnormal-feedback/abnormal-feedback.component';
@Component({
selector: 'app-parter-channel-rebate-management-record',
@ -27,9 +28,8 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
public router: Router,
public ar: ActivatedRoute,
public service: RebateManagementService,
private modalService: NzModalService,
private modal: NzModalService,
public shipperservice: ShipperBaseService,
private modal: ModalHelper
) {}
/**
* 查询字段个数
@ -114,7 +114,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
},
{
title: '异常反馈',
index: 'name1'
render: 'name44'
},
{
title: '操作',
@ -131,15 +131,36 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
];
}
/**
*查看详情
*查看明细
*/
viewEvaluate(item: any) {
// this.modalService
this.modal.createStatic(ParterRebateManageMenRecordDetailComponent, {i:item}).subscribe((res: boolean)=> {
const modal = this.modal.create({
nzTitle: '明细',
nzWidth: 1200,
nzContent: ParterRebateManageMenRecordDetailComponent,
nzComponentParams: { },
nzFooter: null
});
modal.afterClose.subscribe((res: any) => {
if (res) {
}
})
});
}
/**
*异常反馈
*/
feedback(item?: any) {
const modal = this.modal.create({
nzTitle: '异常反馈',
nzWidth: 580,
nzContent: ParterRebateManageMenAbnormalFeedbackComponent,
nzComponentParams: { i: item },
nzFooter: null
});
modal.afterClose.subscribe((res: any) => {
if (res) {
}
});
}
/**
* 重置表单

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

@ -0,0 +1,48 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
* @LastEditTime : 2022-03-10 15:12:03
* @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"
>
<ng-template st-row='name44' let-item let-index='index'>
<div style="color: #f59a23;" (click)="feedback()">1223</div>
</ng-template>
</st>
</nz-card>

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

@ -0,0 +1,172 @@
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';
import { ParterRebateManageMenAbnormalFeedbackComponent } from '../../model/abnormal-feedback/abnormal-feedback.component';
@Component({
selector: 'app-parter-channel-rebate-management-setting',
templateUrl: './rebate-setting.component.html'
})
export class ParterRebateManageMentSettingComponent 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 modal: 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 } },
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: '异常反馈',
render: 'name44'
},
{
title: '操作',
fixed: 'right',
width: '90px',
className: 'text-left',
buttons: [
{
text: '明细',
click: _record => this.viewEvaluate(_record),
}
]
}
];
}
/**
*查看明细
*/
viewEvaluate(item: any) {
const modal = this.modal.create({
nzTitle: '明细',
nzWidth: 1200,
nzContent: ParterRebateManageMenRecordDetailComponent,
nzComponentParams: { },
nzFooter: null
});
modal.afterClose.subscribe((res: any) => {
if (res) {
}
});
}
/**
*异常反馈
*/
feedback(item?: any) {
const modal = this.modal.create({
nzTitle: '异常反馈',
nzWidth: 580,
nzContent: ParterRebateManageMenAbnormalFeedbackComponent,
nzComponentParams: { i: item },
nzFooter: null
});
modal.afterClose.subscribe((res: any) => {
if (res) {
}
});
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
this.st.load(1);
}
}

38
src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html Normal file
View File

@ -0,0 +1,38 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
* @LastEditTime : 2022-03-10 15:10:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<sv-container col="1">
<sv label="异常反馈">
<div>有订单有异常请查看 </div>
<div>2022-09-08 00:00:00 </div>
</sv>
<!-- <sv label="异常反馈">
<p *ngFor="let data of i?.mybidDetailInfo; let index = index">
<label *ngIf="data?.paymentStatusLabel == '已支付'">
<span>{{data?.expenseName}}</span>
<span>{{ data.price | number: '0.2-2' }}</span>
</label>
</p>
</sv> -->
</sv-container>
<div>
<sf
style="margin-left: 20px;"
#sf
[schema]="schema"
[ui]="ui"
[mode]="'edit'"
[button]="'none'"
></sf>
</div>
<div nz-col class="text-center">
<button nz-button nzType="primary" (click)="close()">确定</button>
</div>

6
src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.less Normal file
View File

@ -0,0 +1,6 @@
:host {
[nz-button] {
margin-right: 8px;
margin-bottom: 12px;
}
}

72
src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts Normal file
View File

@ -0,0 +1,72 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-03-10 14:50:45
* @LastEditors : Shiming
* @LastEditTime : 2022-03-10 15:09:51
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
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, SFSelectWidgetSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { processSingleSort, ShipperBaseService } from '@shared';
import { NzModalService, NzModalRef } from 'ng-zorro-antd/modal';
import { RebateManagementService } from '../../services/rebate-management.service';
import { NzButtonSize } from 'ng-zorro-antd/button';
@Component({
selector: 'app-parter-channel-rebate-management-abnormal-feedback',
templateUrl: './abnormal-feedback.component.html'
})
export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
schema: SFSchema = {};
ui!: SFUISchema;
@ViewChild('sf', { static: false })
sf!: SFComponent;
i!: any;
data = [{ name1: 1111 }];
constructor(
public router: Router,
public ar: ActivatedRoute,
public service: RebateManagementService,
private modalService: NzModalService,
public shipperservice: ShipperBaseService,
public modalRef: NzModalRef,
) {}
ngOnInit() {
this.initSF();
}
initSF() {
this.schema = {
properties: {
name3: {
type: 'string',
title: '回复',
maxLength: 50,
ui: {
widget: 'textarea',
autosize: { minRows: 3, maxRows: 6 },
placeholder:'请不要超过50个字'
} as SFTextareaWidgetSchema,
},
}
};
this.ui = {
'*': {
spanLabelFixed: 60,
grid: { span: 16 },
}
};
}
close() {
this.modalRef.destroy()
}
}

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

@ -517,7 +517,7 @@
"group": true,
"children": [{
"text": "返佣配置",
"link": "/partner/rebate/"
"link": "/partner/rebate/setting"
},
{
"text": "返佣明细",