From f52074b16fe2a8db307ab5d37821b0863e9eb6fc Mon Sep 17 00:00:00 2001 From: "xiaoxing.liu" Date: Wed, 27 Apr 2022 12:00:47 +0800 Subject: [PATCH 1/5] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../freight/list/detail/detail.component.ts | 63 +++++++++---------- 1 file changed, 31 insertions(+), 32 deletions(-) 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(){ From 5a429bafdf9170f7f8d06eea38cfbce8e51f4ada Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 13:45:00 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.conf.js | 4 +- .../routes/partner/partner-routing.module.ts | 7 -- src/app/routes/partner/partner.module.ts | 4 +- .../rebate-setting/add/add.component.html | 4 +- .../rebate-setting/add/add.component.ts | 93 ++++++++++--------- .../system-config/services/config.service.ts | 12 --- .../basic-setting.component.html | 2 +- .../components/config/config.component.html | 2 - .../components/config/config.component.less | 0 .../components/config/config.component.ts | 4 +- .../routes/sys-setting/sys-setting.module.ts | 6 +- 11 files changed, 61 insertions(+), 77 deletions(-) delete mode 100644 src/app/routes/partner/system-config/services/config.service.ts rename src/app/routes/{partner/system-config => sys-setting}/components/config/config.component.html (99%) rename src/app/routes/{partner/system-config => sys-setting}/components/config/config.component.less (100%) rename src/app/routes/{partner/system-config => sys-setting}/components/config/config.component.ts (98%) diff --git a/proxy.conf.js b/proxy.conf.js index d9d60dfc..0cbdec59 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -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 }, diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts index fd999157..277e01d4 100644 --- a/src/app/routes/partner/partner-routing.module.ts +++ b/src/app/routes/partner/partner-routing.module.ts @@ -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: [ diff --git a/src/app/routes/partner/partner.module.ts b/src/app/routes/partner/partner.module.ts index 300a83f1..d73c4b94 100644 --- a/src/app/routes/partner/partner.module.ts +++ b/src/app/routes/partner/partner.module.ts @@ -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({ diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index b39e4913..e1f63b54 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -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" > diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 6e0b851b..5e40e54d 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -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; } } - } diff --git a/src/app/routes/partner/system-config/services/config.service.ts b/src/app/routes/partner/system-config/services/config.service.ts deleted file mode 100644 index 0b79dfd0..00000000 --- a/src/app/routes/partner/system-config/services/config.service.ts +++ /dev/null @@ -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); - } -} diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html index 7a3c023c..b9beb147 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html @@ -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. --> diff --git a/src/app/routes/partner/system-config/components/config/config.component.html b/src/app/routes/sys-setting/components/config/config.component.html similarity index 99% rename from src/app/routes/partner/system-config/components/config/config.component.html rename to src/app/routes/sys-setting/components/config/config.component.html index 81aff0b8..aaea9add 100644 --- a/src/app/routes/partner/system-config/components/config/config.component.html +++ b/src/app/routes/sys-setting/components/config/config.component.html @@ -1,4 +1,3 @@ -
@@ -72,7 +71,6 @@
-
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 98% 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..54e0265c 100644 --- a/src/app/routes/partner/system-config/components/config/config.component.ts +++ b/src/app/routes/sys-setting/components/config/config.component.ts @@ -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(); 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, From 527d8305c17ee9cf39ae0f9cb3ac5f7bb451725d Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 14:13:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../add-partnerlist.component.html | 5 ++--- .../add-partnerlist.component.ts | 1 - .../rebate-table/rebate-table.component.html | 21 ++++++++++--------- .../rebate-table/rebate-table.component.less | 3 +++ 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html index 5d060bcc..ec101aaf 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html @@ -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' }"> - + diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts index bf422f94..4acbe111 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts @@ -55,7 +55,6 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit { { text: '添加', click: _record => this.add(_record), - acl: { ability: ['AbnormalAppear-reply'] } } ] } 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 @@
- +
- +
@@ -64,15 +64,16 @@
-
+
+ + % + - - - % - + +
diff --git a/src/app/shared/components/rebate-table/rebate-table.component.less b/src/app/shared/components/rebate-table/rebate-table.component.less index ec0862bd..328d89c8 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.less +++ b/src/app/shared/components/rebate-table/rebate-table.component.less @@ -18,5 +18,8 @@ .ant-input-affix-wrapper { border: none } + .three .ant-input-affix-wrapper { + width: 50% !important; + } } \ No newline at end of file From 6afb30432e07fe60f45c6112710dc394083c45b3 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 27 Apr 2022 15:08:22 +0800 Subject: [PATCH 4/5] edit --- .../organization-management.component.html | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) 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 }} - 编辑 - - 删除 - - 新增子组织 -
- - 配置接口权限 - - 配置数据权限 + + 编辑 + + 删除 + + 新增子组织 +
+ + 配置接口权限 + + 配置数据权限 + + From 741b5e4f8e65c201be026bd55a76777325a49de2 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 27 Apr 2022 15:34:00 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bulk/bulk.component.html | 2 +- .../components/bulk/bulk.component.ts | 6 +- .../compliance-audit.component.ts | 8 +- .../components/vehicle/vehicle.component.ts | 6 +- .../rebate-setting/add/add.component.html | 2 +- .../rebate-setting/add/add.component.ts | 70 ++++---- .../rebate-setting.component.html | 2 +- .../rebate-setting.component.ts | 8 +- .../basic-setting.component.html | 4 +- .../components/config/config.component.ts | 151 ++++++++++-------- 10 files changed, 135 insertions(+), 124 deletions(-) diff --git a/src/app/routes/order-management/components/bulk/bulk.component.html b/src/app/routes/order-management/components/bulk/bulk.component.html index a2b6d182..47b1cd8f 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.html +++ b/src/app/routes/order-management/components/bulk/bulk.component.html @@ -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. --> diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index aeccbc6d..f027a4e3 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -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' } ]; } /** diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index 4b645c2f..231c5d61 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -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' } diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 5e6bca10..ef242949 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -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' } ]; } // 获取城市列表 diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html index e1f63b54..a72764af 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 13:38:57 + * @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. --> diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 5e40e54d..96080492 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-21 09:26:45 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 13:44:19 + * @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. */ @@ -143,33 +143,33 @@ export class ParterRebateManageMentAddComponent implements OnInit { }); } save() { - 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) => { - if (element.startAmount > element.endAmount) { - real = true; - return; - } - }); - if (real) { - 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) => { + // if (element.startAmount > element.endAmount) { + // real = true; + // return; + // } + // }); + // if (real) { + // this.service.msgSrv.warning('初始业务量不能超过到达业务量！'); + // return; + // } const params = { accountingRate: this.accountingRate, @@ -182,12 +182,14 @@ export class ParterRebateManageMentAddComponent implements OnInit { 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']); - } - }); + console.log(params); + + // 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) => { diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html index 5d636436..b433bc9f 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html @@ -58,7 +58,7 @@
自定义合伙人
-
{{item?.stateLocked ? '启用' : '禁用'}}
+
{{item?.stateLocked ? '生效中' : '失效'}}
 diff --git a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts index 49a1d8d0..08265976 100644 --- a/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts +++ b/src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts @@ -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', }, diff --git a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html index b9beb147..c1c43834 100644 --- a/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html +++ b/src/app/routes/sys-setting/components/basic-setting/basic-setting.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-21 13:49:22 * @LastEditors : Shiming - * @LastEditTime : 2022-04-27 11:29:10 + * @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" > - + diff --git a/src/app/routes/sys-setting/components/config/config.component.ts b/src/app/routes/sys-setting/components/config/config.component.ts index 54e0265c..d1a92c7b 100644 --- a/src/app/routes/sys-setting/components/config/config.component.ts +++ b/src/app/routes/sys-setting/components/config/config.component.ts @@ -1,4 +1,4 @@ -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'; @@ -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: 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) {