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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-27 13:45:00 +08:00
parent f0afe10ec1
commit 5a429bafdf
11 changed files with 61 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,6 @@ import { BannerComponentsAddComponent } from './knowledge/banner/components/add/
import { PersonalPartnerDetailComponent } from './partner-list/components/personal-partner-detail/personal-partner-detail.component';
import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/list/list.component';
import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
import { PartnerSystemConfigComponent } from './system-config/components/config/config.component';
const routes: Routes = [
{
@ -153,12 +152,6 @@ const routes: Routes = [
{ path: 'record/detail/:id', component: PartnerRecordedDetailComponent }
]
},
{
path: 'config',
children: [
{ path: '', component: PartnerSystemConfigComponent },
]
},
{
path: 'knowledge',
children: [

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-09 14:34:55
* @LastEditors : Shiming
* @LastEditTime : 2022-04-20 15:45:20
* @LastEditTime : 2022-04-27 11:28:31
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\partner.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -63,7 +63,6 @@ import { ParterAdviceFeedbackListComponent } from './advice-feedback/components/
import { ParterAdviceFeedbackDetailComponent } from './advice-feedback/components/feedback-detail/feedback-detail.component';
import { ParterRebateManageMentAddPartnerListComponent } from './rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component';
import { ChannelLogModalComponent } from './partner-list/components/channel-log-modal/channel-log-modal.component';
import { PartnerSystemConfigComponent } from './system-config/components/config/config.component';
const COMPONENTS: any[] = [
PartnerBusinessStatisticsIndexComponent,
@ -117,7 +116,6 @@ const COMPONENTS: any[] = [
ParterAdviceFeedbackDetailComponent,
ParterRebateManageMentAddPartnerListComponent,
ChannelLogModalComponent,
PartnerSystemConfigComponent
];
@NgModule({

4
src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming
* @LastEditTime : 2022-04-26 20:44:56
* @LastEditTime : 2022-04-27 13:38:57
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -102,7 +102,7 @@
style="max-width: 400px; min-width: 200px; margin-left: 40px"
rows="4"
nz-input
[(ngModel)]="remarke"
[(ngModel)]="remark"
></textarea>
</sv>
</sv-container>

93
src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-21 09:26:45
* @LastEditors : Shiming
* @LastEditTime : 2022-04-26 21:06:50
* @LastEditTime : 2022-04-27 13:44:19
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -23,7 +23,7 @@ import { ParterRebateManageMentAddPartnerListComponent } from '../add-partnerlis
})
export class ParterRebateManageMentAddComponent implements OnInit {
@ViewChild('table') table!: any;
titleText :string= '新增';
titleText: string = '新增';
tabelData: any;
tabelType: any;
formData: any;
@ -31,7 +31,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
hiden: boolean = false;
configName: string = '';
partnerType: string = '';
remarke: string = '';
remark: string = '';
accountingRate: Number = 0;
priority: string = '';
partnerPeopleList: any = [];
@ -50,7 +50,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
private modal: NzModalService,
public shipperservice: ShipperBaseService
) {}
columns: STColumn[] =[]
columns: STColumn[] = [];
initSF(data?: any) {
this.schema1 = {
properties: {
@ -59,7 +59,6 @@ export class ParterRebateManageMentAddComponent implements OnInit {
title: '',
disabled: this.hiden,
ui: {
widget: 'tinymce',
loadingTip: 'loading...',
config: {
@ -70,7 +69,7 @@ export class ParterRebateManageMentAddComponent implements OnInit {
}
}
};
this.columns= [
this.columns = [
{
title: '合伙人名称',
index: 'enterpriseName',
@ -88,8 +87,8 @@ export class ParterRebateManageMentAddComponent implements OnInit {
{
text: '移除',
click: _record => this.delete(_record),
iif: ()=> {
return !this.hiden
iif: () => {
return !this.hiden;
},
acl: { ability: ['AbnormalAppear-reply'] }
}
@ -98,9 +97,9 @@ export class ParterRebateManageMentAddComponent implements OnInit {
];
}
ngOnInit() {
if(this.ar.snapshot?.queryParams?.id) {
this.titleText= '查看'
this.hiden= true
if (this.ar.snapshot?.queryParams?.id) {
this.titleText = '查看';
this.hiden = true;
this.initSF();
this.initData(this.ar.snapshot?.queryParams?.id);
}
@ -144,27 +143,34 @@ export class ParterRebateManageMentAddComponent implements OnInit {
});
}
save() {
console.log(this.configName);
// if(!this.configName) {
// this.service.msgSrv.warning('请输入配置名称！');
// return
// }
// if(!this.accountingRate) {
// this.service.msgSrv.warning('请输入固定结算费率！');
// return
// }
// if(!this.partnerType) {
// this.service.msgSrv.warning('请选择合伙人范围！');
// return
// }
// if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) {
// this.service.msgSrv.warning('请选择合伙人！');
// return
// }
if(!this.configName) {
this.service.msgSrv.warning('请输入配置名称！');
return
}
if(!this.accountingRate) {
this.service.msgSrv.warning('请输入固定结算费率！');
return
}
if(!this.partnerType) {
this.service.msgSrv.warning('请选择合伙人范围！');
return
}
if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) {
this.service.msgSrv.warning('请选择合伙人！');
return
}
let real = false;
this.table.data.forEach((element: any) => {
console.log(element);
if (element.startAmount > element.endAmount) {
real = true;
return;
}
});
if (real) {
this.service.msgSrv.warning('初始业务量不能超过到达业务量！');
return;
}
const params = {
accountingRate: this.accountingRate,
configName: this.configName,
@ -173,19 +179,19 @@ export class ParterRebateManageMentAddComponent implements OnInit {
priority: this.priority, // 优先级
partnerIds: this.partnerId,
ruleDescription: this.sf.value.ruleDescription,
remarke: this.remarke,
remark: this.remark,
partnerType: this.partnerType
};
// this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => {
// if (res) {
// this.service.msgSrv.success('新增成功！');
// this.router.navigate(['/partner/rebate/setting']);
// }
// });
this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => {
if (res) {
this.service.msgSrv.success('新增成功！');
this.router.navigate(['/partner/rebate/setting']);
}
});
}
initData(id:string) {
this.service.request(this.service.$api_get_getPartnerRebateConfigInfo, {id: id}).subscribe((res: any) => {
if(res) {
initData(id: string) {
this.service.request(this.service.$api_get_getPartnerRebateConfigInfo, { id: id }).subscribe((res: any) => {
if (res) {
this.configName = res?.configName;
this.accountingRate = res?.accountingRate;
this.accountingRate = res?.accountingRate;
@ -194,10 +200,10 @@ export class ParterRebateManageMentAddComponent implements OnInit {
this.partnerType = res?.partnerType + '';
this.partnerPeopleList = res?.partnerListVOs;
this.priority = res?.priority + '';
this.formData = {ruleDescription: res?.ruleDescription};
this.remarke = res.remark;
this.formData = { ruleDescription: res?.ruleDescription };
this.remark = res.remark;
}
})
});
}
changePartner(value: any) {
if (value == '3') {
@ -206,5 +212,4 @@ export class ParterRebateManageMentAddComponent implements OnInit {
this.addStatus = false;
}
}
}

12
src/app/routes/partner/system-config/services/config.service.ts
View File

@ -1,12 +0,0 @@
import { Injectable, Injector } from '@angular/core';
import { BaseService } from '@shared';
@Injectable({
providedIn: 'root',
})
export class ConfigService extends BaseService {
constructor(public injector: Injector) {
super(injector);
}
}

2
src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-04-21 13:49:22
* @LastEditors : Shiming
* @LastEditTime : 2022-04-27 10:56:40
* @LastEditTime : 2022-04-27 11:29:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->

2
src/app/routes/partner/system-config/components/config/config.component.html → src/app/routes/sys-setting/components/config/config.component.html
View File

@ -1,4 +1,3 @@
<nz-card>
<div nz-row [nzGutter]="8">
<div nz-col nzSpan="20" style="overflow: scroll">
<nz-card class="card-height" [nzBordered]="null" nzSize="small" *ngIf="selectedTab === 0">
@ -72,7 +71,6 @@
</div>
</div>
</div>
</nz-card>
<ng-template #auditTimes let-data="data" let-title="title">
<div *ngIf="auditTimeStatus" >

0
src/app/routes/partner/system-config/components/config/config.component.less → src/app/routes/sys-setting/components/config/config.component.less
View File

4
src/app/routes/partner/system-config/components/config/config.component.ts → src/app/routes/sys-setting/components/config/config.component.ts
View File

@ -2,8 +2,8 @@ import { Component, OnInit, ViewChild } from '@angular/core';
import { SFComponent, SFSchema, SFUploadWidgetSchema } from '@delon/form';
import { NzUploadFile } from 'ng-zorro-antd/upload';
import { Observable, Observer, of } from 'rxjs';
import { ConfigService } from '../../services/config.service';
import { apiConf } from '@conf/api.conf';
import { SystemService } from '../../services/system.service';
const IMAGECONFIG = {
previewFile: (file: NzUploadFile) => of(file.url),
action: apiConf.waterFileUpload,
@ -95,7 +95,7 @@ export class PartnerSystemConfigComponent implements OnInit {
// showRequired: true
// };
constructor(private service: ConfigService) {}
constructor(private service: SystemService) {}
ngOnInit() {
this.initSF();

6
src/app/routes/sys-setting/sys-setting.module.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:23:05
* @LastEditTime : 2022-03-09 14:08:38
* @LastEditTime : 2022-04-27 11:28:48
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\sys-setting.module.ts
@ -38,6 +38,7 @@ import { OrganizationManagementComponent } from './components/organization-manag
import { OrganizationModalComponent } from './components/organization-management/organization-modal/organization-modal.component';
import { ApiAuthModalComponent } from './components/organization-management/api-auth-modal/api-auth-modal.component';
import { MenuTreeComponent } from './components/organization-management/menu-tree/menu-tree.component';
import { PartnerSystemConfigComponent } from './components/config/config.component';
const COMPONENTS = [
StaffManagementComponent,
@ -57,7 +58,8 @@ const COMPONENTS = [
InsuranceSetComponent,
NoTeManagementComponent,
SmsTemplateComponent,
OrganizationManagementComponent
OrganizationManagementComponent,
PartnerSystemConfigComponent
];
const NOTROUTECOMPONENTS = [
BuyerTranspowerComponent,