diff --git a/src/app/routes/partner/system-config/components/config/config.component.less b/src/app/routes/sys-setting/components/config/config.component.less
similarity index 100%
rename from src/app/routes/partner/system-config/components/config/config.component.less
rename to src/app/routes/sys-setting/components/config/config.component.less
diff --git a/src/app/routes/partner/system-config/components/config/config.component.ts b/src/app/routes/sys-setting/components/config/config.component.ts
similarity index 80%
rename from src/app/routes/partner/system-config/components/config/config.component.ts
rename to src/app/routes/sys-setting/components/config/config.component.ts
index bbac9eb1..d1a92c7b 100644
--- a/src/app/routes/partner/system-config/components/config/config.component.ts
+++ b/src/app/routes/sys-setting/components/config/config.component.ts
@@ -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
=[];
+ TimeStatus: boolean = true;
+ everyDayData: Array = [];
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) {
diff --git a/src/app/routes/sys-setting/components/organization-management/organization-management.component.html b/src/app/routes/sys-setting/components/organization-management/organization-management.component.html
index 5136196e..a7fdf0d0 100644
--- a/src/app/routes/sys-setting/components/organization-management/organization-management.component.html
+++ b/src/app/routes/sys-setting/components/organization-management/organization-management.component.html
@@ -32,16 +32,19 @@
{{ item.createTime }}
- 编辑
-
- 删除
-
- 新增子组织
-
-
- 配置接口权限
-
- 配置数据权限
+
+ 编辑
+
+ 删除
+
+ 新增子组织
+
+
+ 配置接口权限
+
+ 配置数据权限
+
+
|
diff --git a/src/app/routes/sys-setting/sys-setting.module.ts b/src/app/routes/sys-setting/sys-setting.module.ts
index 8905be2d..790c36bd 100644
--- a/src/app/routes/sys-setting/sys-setting.module.ts
+++ b/src/app/routes/sys-setting/sys-setting.module.ts
@@ -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,
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
index bd066e42..4fb06006 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.ts
@@ -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(){
diff --git a/src/app/shared/components/rebate-table/rebate-table.component.html b/src/app/shared/components/rebate-table/rebate-table.component.html
index 2380c116..2a405050 100644
--- a/src/app/shared/components/rebate-table/rebate-table.component.html
+++ b/src/app/shared/components/rebate-table/rebate-table.component.html
@@ -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 @@
| 序号 |
合伙人等级 |
- 初始业务量（万/月） |
- 到达业务量（万/月） |
+ 初始业务量（万/月） |
+ 到达业务量（万/月） |
管理费比例% |
操作 |
@@ -45,7 +45,7 @@