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

Merge branch 'develop'

Browse Source
This commit is contained in:
wangshiming
2022-04-27 15:34:13 +08:00
parent fc944774d4 d2bb698692
commit 5574c1342f
23 changed files with 200 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-04-25 10:32:29
* @LastEditTime : 2022-04-27 11:21:30
* @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -30,7 +30,7 @@ module.exports = {
// },
'//api': {
target: {
host: 'tms-api-test.eascs.com',
host: 'tms-api-dev.eascs.com',
protocol: 'https:',
port: 443
},

2
src/app/routes/order-management/components/bulk/bulk.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-04-22 16:51:29
* @LastEditTime : 2022-04-27 15:32:22
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->

6
src/app/routes/order-management/components/bulk/bulk.component.ts
View File

@ -608,11 +608,11 @@ export class OrderManagementBulkComponent extends BasicTableComponent implements
title: '变更前',
width: '100px',
className: 'text-center',
index: 'amountAfterChange',
render: 'amountAfterChange'
index: 'amountBeforeChange',
render: 'amountBeforeChange'
},
{ title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center', render: 'amountchangeValue' },
{ title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
{ title: '变更后', index: 'amountAfterChange', render: 'amountAfterChange', width: '120px', className: 'text-center' }
];
}
/**

8
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -422,8 +422,8 @@ export class OrderManagementComplianceAuditComponent extends BasicTableComponent
title: '变更前',
width: '100px',
className: 'text-center',
index: 'amountAfterChange',
render: 'amountAfterChange'
index: 'amountBeforeChange',
render: 'amountBeforeChange'
},
{
title: '变更值',
@ -434,8 +434,8 @@ export class OrderManagementComplianceAuditComponent extends BasicTableComponent
},
{
title: '变更后',
index: 'amountBeforeChange',
render: 'amountBeforeChange',
index: 'amountAfterChange',
render: 'amountAfterChange',
width: '120px',
className: 'text-center'
}

6
src/app/routes/order-management/components/vehicle/vehicle.component.ts
View File

@ -522,11 +522,11 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme
title: '变更前',
width: '100px',
className: 'text-center',
index: 'amountAfterChange',
render: 'amountAfterChange'
index: 'amountBeforeChange',
render: 'amountBeforeChange'
},
{ title: '变更值', index: 'amountchangeValue', render: 'amountchangeValue', width: '120px', className: 'text-center' },
{ title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
{ title: '变更后', index: 'amountAfterChange', render: 'amountAfterChange', width: '120px', className: 'text-center' }
];
}
// 获取城市列表

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({

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-03-28 14:53:52
* @LastEditors : Shiming
* @LastEditTime : 2022-04-22 10:30:33
* @LastEditTime : 2022-04-27 14:12:45
* @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add-partnerlist\\add-partnerlist.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -25,6 +25,5 @@
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"
[scroll]="{ x: '1000' }">
</st>
<button style="float: right;" *ngIf="selectedIndex===0" (click)="batchReply()" nz-button nzType="primary" acl
[acl-ability]="['AbnormalAppear-batchReply']">批量选择</button>
<button style="float: right;" *ngIf="selectedIndex===0" (click)="batchReply()" nz-button nzType="primary">批量选择</button>
</nz-card>

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

@ -55,7 +55,6 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit {
{
text: '添加',
click: _record => this.add(_record),
acl: { ability: ['AbnormalAppear-reply'] }
}
]
}

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 15:03:23
* @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>

55
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 14:14:32
* @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,7 +143,6 @@ export class ParterRebateManageMentAddComponent implements OnInit {
});
}
save() {
console.log(this.configName);
// if(!this.configName) {
// this.service.msgSrv.warning('请输入配置名称！');
// return
@ -161,10 +159,18 @@ export class ParterRebateManageMentAddComponent implements OnInit {
// this.service.msgSrv.warning('请选择合伙人！');
// return
// }
this.table.data.forEach((element: any) => {
console.log(element);
});
// let real = false;
// this.table.data.forEach((element: any) => {
// if (element.startAmount > element.endAmount) {
// real = true;
// return;
// }
// });
// if (real) {
// this.service.msgSrv.warning('初始业务量不能超过到达业务量！');
// return;
// }
const params = {
accountingRate: this.accountingRate,
configName: this.configName,
@ -173,9 +179,11 @@ 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
};
console.log(params);
// this.service.request(this.service.$api_save_rebateConfig, params).subscribe((res: any) => {
// if (res) {
// this.service.msgSrv.success('新增成功！');
@ -183,9 +191,9 @@ export class ParterRebateManageMentAddComponent implements OnInit {
// }
// });
}
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 +202,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 +214,4 @@ export class ParterRebateManageMentAddComponent implements OnInit {
this.addStatus = false;
}
}
}

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

@ -58,7 +58,7 @@
<div *ngIf="item.partnerType == 3">自定义合伙人</div>
</ng-template>
<ng-template st-row='stateLocked' let-item let-index='index'>
<div >{{item?.stateLocked ? '启用' : '禁用'}}</div>
<div >{{item?.stateLocked ? '生效中' : '失效'}}</div>
</ng-template>
</st>
</nz-card>

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

@ -77,12 +77,12 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
initST() {
this.columns = [
{
title: '配置名称',
title: '模板名称',
index: 'configName',
width: '200px',
},
{
title: '配置类型',
title: '等级类型',
render: 'configType',
width: '200px',
@ -93,7 +93,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
width: '250px',
},
{
title: '关联合伙人范围',
title: '合伙人范围',
render: 'partnerType',
width: '200px',
},
@ -103,7 +103,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
width: '200px',
},
{
title: '启用时间',
title: '生效时间',
index: 'enableTime',
width: '200px',
},

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);
}
}

4
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 15:17:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\sys-setting\\components\\basic-setting\\basic-setting.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -17,6 +17,6 @@
[labelWidth]="labelWidth"
>
<custom-element>
<app-parterl-config></app-parterl-config>
<app-parterl-config [configList]="configList"></app-parterl-config>
</custom-element>
</app-dynamic-setting-h5>

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

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

@ -1,9 +1,9 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Component, Input, OnInit, ViewChild, OnChanges, SimpleChanges } 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,
@ -23,9 +23,13 @@ const IMAGECONFIG = {
templateUrl: './config.component.html',
styleUrls: ['./config.component.less']
})
export class PartnerSystemConfigComponent implements OnInit {
export class PartnerSystemConfigComponent implements OnInit, OnChanges {
@ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sf2', { static: false }) sf2!: SFComponent;
@Input()
configList: any[] = [];
formDate: any = {
isAudit: false,
isEveryDay: false,
@ -35,9 +39,9 @@ export class PartnerSystemConfigComponent implements OnInit {
enterpriseValue!: number;
auditValue!: number;
auditTime!: any;
auditTimeStatus: boolean = false
everyDay: boolean = false
MonthDay: boolean = false
auditTimeStatus: boolean = false;
everyDay: boolean = false;
MonthDay: boolean = false;
time: Date | null = null;
defaultOpenValue = new Date(0, 0, 0, 0, 0, 0);
tabs = [
@ -49,22 +53,27 @@ export class PartnerSystemConfigComponent implements OnInit {
}
];
selectedTab = 0;
TimeStatus: boolean = true
everyDayData: Array<any> =[];
TimeStatus: boolean = true;
everyDayData: Array<any> = [];
MonthDayData: any = [
{month: [
{ label: '周一', value: '周一', },
{ label: '周二', value: '周二' },
{ label: '周三', value: '周三' },
{ label: '周四', value: '周四' },
{ label: '周五', value: '周五' },
{ label: '周六', value: '周六' },
{ label: '周日', value: '周日' }
], Times:[ {
startTime: [],
endTime: [],
}]}
]
{
month: [
{ label: '周一', value: '周一' },
{ label: '周二', value: '周二' },
{ label: '周三', value: '周三' },
{ label: '周四', value: '周四' },
{ label: '周五', value: '周五' },
{ label: '周六', value: '周六' },
{ label: '周日', value: '周日' }
],
Times: [
{
startTime: [],
endTime: []
}
]
}
];
checkOptionsOne = [
{ label: '周一', value: '周一', checked: true },
@ -94,83 +103,83 @@ export class PartnerSystemConfigComponent implements OnInit {
// listType: 'picture-card',
// showRequired: true
// };
constructor(private service: ConfigService) {}
constructor(private service: SystemService) {}
ngOnChanges(changes: SimpleChanges): void {
if (changes.configList) {
console.log(changes.configList.currentValue);
}
}
ngOnInit() {
this.initSF();
this.everyDayData = [
{
startTime: '',
endTime: '',
}
]
}
addEvery() {
this.everyDayData.push(
{
startTime: [],
endTime: [],
}
)
}
delEvery(index: number) {
this.everyDayData.splice(index, 1)
}
addMonthEvery(value: any) {
this.MonthDayData[value].Times.push(
{
startTime: '',
endTime: ''
}
)
];
}
addEvery() {
this.everyDayData.push({
startTime: [],
endTime: []
});
}
delEvery(index: number) {
this.everyDayData.splice(index, 1);
}
addMonthEvery(value: any) {
this.MonthDayData[value].Times.push({
startTime: '',
endTime: ''
});
}
addMonth() {
this.MonthDayData.push(
{month: [
{ label: '周一', value: '周一', },
this.MonthDayData.push({
month: [
{ label: '周一', value: '周一' },
{ label: '周二', value: '周二' },
{ label: '周三', value: '周三' },
{ label: '周四', value: '周四' },
{ label: '周五', value: '周五' },
{ label: '周六', value: '周六' },
{ label: '周日', value: '周日' }
], Times:[{
startTime: '',
endTime: ''
}]}
)
],
Times: [
{
startTime: '',
endTime: ''
}
]
});
}
delMonth(value: number,index: number) {
this.MonthDayData[value].Times.splice(index, 1)
delMonth(value: number, index: number) {
this.MonthDayData[value].Times.splice(index, 1);
}
changeType(type: number): void {
this.selectedTab = type;
}
changeMonth(type: any): void {
console.log(type);
console.log( this.MonthDayData);
console.log(this.MonthDayData);
}
everyDayChange(type: any): void {
console.log(type);
if(type) {
this.MonthDay = false
this.TimeStatus = true
if (type) {
this.MonthDay = false;
this.TimeStatus = true;
}
}
MonthDayChange(type: any): void {
console.log(type);
if(type) {
this.everyDay = false
this.TimeStatus = false
if (type) {
this.everyDay = false;
this.TimeStatus = false;
}
}
initSF() {
this.schema = {
properties: {
roadTransportPhoto: { title: '', type: 'string', ui: { hidden: true } },
@ -184,7 +193,7 @@ export class PartnerSystemConfigComponent implements OnInit {
if (args.type === 'success') {
this.sf.setValue('/roadTransportPhoto', args.fileList[0].response.data.fullFilePath);
}
},
}
} as SFUploadWidgetSchema
},
share: { title: '', type: 'string', ui: { hidden: true } },
@ -198,7 +207,7 @@ export class PartnerSystemConfigComponent implements OnInit {
if (args.type === 'success') {
this.sf.setValue('/share', args.fileList[0].response.data.fullFilePath);
}
},
}
} as SFUploadWidgetSchema
},
take: { title: '', type: 'string', ui: { hidden: true } },
@ -212,7 +221,7 @@ export class PartnerSystemConfigComponent implements OnInit {
if (args.type === 'success') {
this.sf.setValue('/take', args.fileList[0].response.data.fullFilePath);
}
},
}
} as SFUploadWidgetSchema
},
complianceRemark: {
@ -241,7 +250,7 @@ export class PartnerSystemConfigComponent implements OnInit {
if (args.type === 'success') {
this.sf2.setValue('/roadTransportPhoto', args.fileList[0].response.data.fullFilePath);
}
},
}
} as SFUploadWidgetSchema
},
share: { title: '', type: 'string', ui: { hidden: true } },
@ -255,7 +264,7 @@ export class PartnerSystemConfigComponent implements OnInit {
if (args.type === 'success') {
this.sf2.setValue('/share', args.fileList[0].response.data.fullFilePath);
}
},
}
} as SFUploadWidgetSchema
},
take: { title: '', type: 'string', ui: { hidden: true } },
@ -269,7 +278,7 @@ export class PartnerSystemConfigComponent implements OnInit {
if (args.type === 'success') {
this.sf2.setValue('/take', args.fileList[0].response.data.fullFilePath);
}
},
}
} as SFUploadWidgetSchema
},
complianceRemark: {
@ -307,10 +316,10 @@ export class PartnerSystemConfigComponent implements OnInit {
};
changeAuto(value: any) {
console.log(value);
if(value == '2') {
this.auditTimeStatus = true
if (value == '2') {
this.auditTimeStatus = true;
} else {
this.auditTimeStatus = false
this.auditTimeStatus = false;
}
}
private getImageModel(args: any, key: any) {

23
src/app/routes/sys-setting/components/organization-management/organization-management.component.html
View File

@ -32,16 +32,19 @@
{{ item.createTime }}
</td>
<td nzAlign="center" nzWidth="250px">
<a (click)="menuAction(item)">编辑</a>
<nz-divider nzType="vertical"></nz-divider>
<a (click)="deleteAction(item)">删除</a>
<nz-divider nzType="vertical"></nz-divider>
<a (click)="menuAction(null,item.id)">新增子组织</a>
<br>
<nz-divider nzType="vertical"></nz-divider>
<a (click)="configureAPIauth(item)">配置接口权限</a>
<nz-divider nzType="vertical"></nz-divider>
<a>配置数据权限</a>
<ng-container *ngIf="item.roleCode !== 'Administrator'">
<a (click)="menuAction(item)">编辑</a>
<nz-divider nzType="vertical"></nz-divider>
<a (click)="deleteAction(item)">删除</a>
<nz-divider nzType="vertical"></nz-divider>
<a (click)="menuAction(null,item.id)">新增子组织</a>
<br>
<nz-divider nzType="vertical"></nz-divider>
<a (click)="configureAPIauth(item)">配置接口权限</a>
<nz-divider nzType="vertical"></nz-divider>
<a>配置数据权限</a>
</ng-container>
</td>
</tr>
</ng-container>

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,

63
src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
View File

@ -97,8 +97,7 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
initST() {
this.columns = [
{ title: '修改后合伙人', index: 'newPartnerName', className: 'text-center' },
{ title: '修改前合伙人', index: 'originalPartnerNamel', className: 'text-center' },
{ title: '备注', render: 'remark', className: 'text-center' },
{ title: '修改前合伙人', index: 'originalPartnerName', className: 'text-center' },
{ title: '结算起算日', index: 'settStartTime', className: 'text-center' },
{ title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: {
1: '立即生效',
@ -115,38 +114,38 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
},
className: 'text-center'
},
{ title: '修改时间', render: 'modifyTime', className: 'text-center' },
{ title: '生效时间', index: 'effectiveTime', className: 'text-center' },
{ title: '操作人', render: 'approvalUser', className: 'text-center' },
];
}
/**
* 初始化数据列表
*/
initRecordST() {
this.recordColumns = [
{ title: '修改后渠道销售', index: 'newChannelName', className: 'text-center' },
{ title: '修改前渠道销售地', index: 'originalChannelName', className: 'text-center' },
{ title: '备注', render: 'remark', className: 'text-center' },
{ title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: {
1: '立即生效',
2: 'CRM审核后生效',
3: '审核通过生效',
} },
{
title: 'CRM审核状态', index: 'effectiveStatus',
type: 'enum',
enum: {
0: '已失效',
1: '未生效',
2: '已生效',
},
className: 'text-center'
},
{ title: '修改时间', index: 'modifyTime', className: 'text-center' },
{ title: '生效时间', index: 'effectiveTime', className: 'text-center' },
{ title: '操作人', index: 'modifyUserId', className: 'text-center' }
{ title: '操作人', index: 'modifyUserId', className: 'text-center' },
{ title: '备注', render: 'remark', className: 'text-center' },
];
}
/**
* 初始化数据列表
*/
initRecordST() {
this.recordColumns = [
{ title: '修改后渠道销售', index: 'newChannelName', className: 'text-center' },
{ title: '修改前渠道销售地', index: 'originalChannelName', className: 'text-center' },
{ title: '生效节点', index: 'effectiveNode', className: 'text-center', type: 'enum', enum: {
1: '立即生效',
2: 'CRM审核后生效',
3: '审核通过生效',
} },
{
title: 'CRM审核状态', index: 'effectiveStatus',
type: 'enum',
enum: {
0: '已失效',
1: '未生效',
2: '已生效',
},
className: 'text-center'
},
{ title: '修改时间', index: 'modifyTime', className: 'text-center' },
{ title: '生效时间', index: 'effectiveTime', className: 'text-center' },
{ title: '操作人', index: 'modifyUserId', className: 'text-center' },
{ title: '备注', render: 'remark', className: 'text-center' },
];
}
loadPartnerInfo(){

21
src/app/shared/components/rebate-table/rebate-table.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2022-01-25 20:18:52
* @LastEditors : Shiming
* @LastEditTime : 2022-04-26 20:46:19
* @LastEditTime : 2022-04-27 14:09:04
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -20,8 +20,8 @@
<tr>
<th rowspan="2" nzWidth="60px" nzAlign="center" nzLeft>序号</th>
<th nzWidth="220px" nzAlign="center" >合伙人等级</th>
<th nzWidth="160px" nzAlign="center" >初始业务量（万/月）</th>
<th nzWidth="160px" nzAlign="center" >到达业务量（万/月）</th>
<th nzWidth="160px" *ngIf="type == '2'" nzAlign="center" >初始业务量（万/月）</th>
<th nzWidth="160px" *ngIf="type == '2'" nzAlign="center" >到达业务量（万/月）</th>
<th nzWidth="160px" nzAlign="center" >管理费比例%</th>
<th rowspan="2" nzWidth="60px" nzAlign="center" nzRight *ngIf="type == '2'">操作</th>
</tr>
@ -45,7 +45,7 @@
</nz-select>
</div>
</td>
<td nzWidth="160px" nzAlign="center" >
<td nzWidth="160px" nzAlign="center" *ngIf="type == '2'" >
<div >
<nz-input-group nzPrefix="=" >
<nz-input-number nzPrefix="=" [(ngModel)]="item.startAmount" [nzMin]="0" [nzMax]="99999999"nzSize="small" (ngModelChange)="changeendAmount($event,i)"
@ -55,7 +55,7 @@
</div>
</td>
<td nzWidth="160px" nzAlign="center" >
<td nzWidth="160px" nzAlign="center" *ngIf="type == '2'" >
<div >
<nz-input-group nzPrefix="＜">
<nz-input-number [(ngModel)]="item.endAmount" [nzMin]="0" [nzMax]="99999999" nzSize="small" >
@ -64,15 +64,16 @@
</div>
</td>
<td nzWidth="160px" nzAlign="center" >
<div >
<div class="three" style="text-align: center;">
<nz-input-group [nzAddOnAfter]="addOnAfterTemplate2">
<nz-input-number [(ngModel)]="item.managementFeeRatio" [nzMin]="0" [nzMax]="100"nzSize="small"
>
<ng-template #addOnAfterTemplate2>
<span >%</span>
</ng-template>
</nz-input-number>
</nz-input-group>
<ng-template #addOnAfterTemplate2>
<span >%</span>
</ng-template>
</nz-input-group>
</div>
</td>
<td nzWidth="60px" nzAlign="center" nzRight *ngIf="type == '2'">

3
src/app/shared/components/rebate-table/rebate-table.component.less
View File

@ -18,5 +18,8 @@
.ant-input-affix-wrapper {
border: none
}
.three .ant-input-affix-wrapper {
width: 50% !important;
}
}