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-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/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, diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index a8f18617..901d2adb 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -247,7 +247,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { enum: [ { label: '全部', value: '' }, { label: '整车', value: '1' }, - { label: '大宗', value: '2' } + { label: '大宗', value: '2' }, ], ui: { widget: 'select', @@ -305,7 +305,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { { title: '订单完成日期', index: 'billfinTime', type: 'date', width: 150 }, { title: '开票状态', index: 'vatappStsLabel', width: 100 }, { title: '所属项目', index: 'projectIdName', width: 140 }, - { title: '订单类型', index: 'billType', width: 100, type: 'enum', enum: { 1: '整车', 2: '大宗' } }, + { title: '订单类型', index: 'billTypeLabel', width: 100,}, { title: '装货地', index: 'loadingfrom', width: 220 }, { title: '卸货地', index: 'loadingto', width: 220 }, { title: '货物信息', index: 'goodsinfo', width: 150 }, 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 @@
- +
- +
@@ -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