From 7a7452db8f0ed645f0913c682d7f0c4989fad895 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 5 May 2022 11:12:35 +0800 Subject: [PATCH 01/11] UI --- .../etc-invoiced-list/etc-invoiced-list.component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts index 08a3e367..67a101d4 100644 --- a/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts +++ b/src/app/routes/ticket-management/components/etc-invoiced-list/etc-invoiced-list.component.ts @@ -152,9 +152,7 @@ export class ETCInvoicedListComponent implements OnInit { { title: '订单号', index: 'billCode', width: 200 }, { title: '开票状态', - index: 'invoicingStatus', - type: 'enum', - enum: { '0': '待开票', '1': '开票中', '2': '已开票', '3': '开票失败' }, + index: 'invoicingStatusLabel', width: 120 }, { title: '订单类型', index: 'billTypeLabel', width: 120 }, From 58e16934e9fe8ab27d6d3dfbfb77e4f9e614b648 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 5 May 2022 11:18:12 +0800 Subject: [PATCH 02/11] UI --- .../api-auth-modal/api-auth-modal.component.html | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/app/routes/sys-setting/components/organization-management/api-auth-modal/api-auth-modal.component.html b/src/app/routes/sys-setting/components/organization-management/api-auth-modal/api-auth-modal.component.html index b7d4e764..472d869b 100644 --- a/src/app/routes/sys-setting/components/organization-management/api-auth-modal/api-auth-modal.component.html +++ b/src/app/routes/sys-setting/components/organization-management/api-auth-modal/api-auth-modal.component.html @@ -1,12 +1,8 @@ - - - - - - + +
From e59ecb9335c86314b8f5f8c2e4d622f6d5e241fa Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 5 May 2022 13:28:49 +0800 Subject: [PATCH 03/11] fix bug --- .../freight/list/detail/detail.component.html | 15 +++++++-------- .../components/freight/list/list.component.html | 4 ++-- .../components/freight/list/list.component.ts | 16 ++++++++-------- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html index 9da6addd..74f169b5 100644 --- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html +++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html @@ -366,7 +366,7 @@ - + + - + --> - + - +
diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index f62797c1..e65d6c7a 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -79,10 +79,10 @@
-
+ diff --git a/src/app/routes/usercenter/components/freight/list/list.component.ts b/src/app/routes/usercenter/components/freight/list/list.component.ts index d7d5860c..249824d0 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -503,14 +503,14 @@ export class FreightComponentsListComponent implements OnInit { text: '分配客服人员', click: item => this.showService(item) }, - { - text: '修改合伙人', - click: item => this.editPartner(item) - }, - { - text: '修改渠道销售', - click: item => this.editSale(item) - } + // { + // text: '修改合伙人', + // click: item => this.editPartner(item) + // }, + // { + // text: '修改渠道销售', + // click: item => this.editSale(item) + // } ] } ]; From 0aa73e41708b72e11affd81465197721b7229555 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 5 May 2022 13:30:03 +0800 Subject: [PATCH 04/11] fix bug --- .../components/freight/list/list.component.html | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index 1d72cb95..a26b9fd2 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -38,12 +38,12 @@
  • 新增企业
    • -
  • +
    • @@ -91,21 +91,11 @@
    -<<<<<<< HEAD - - - -======= --> ->>>>>>> fc92a8b86874ab4a25a1d2625dea8fafe2bc557e From bede7b0f34336f72e01a83174f1679fbb35d7cf0 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 5 May 2022 13:36:54 +0800 Subject: [PATCH 05/11] UI --- src/app/routes/partner/partner-routing.module.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/app/routes/partner/partner-routing.module.ts b/src/app/routes/partner/partner-routing.module.ts index f52f310b..eefdeb5d 100644 --- a/src/app/routes/partner/partner-routing.module.ts +++ b/src/app/routes/partner/partner-routing.module.ts @@ -66,8 +66,7 @@ const routes: Routes = [ { path: 'channel-sales', children: [ - { path: '', component: ParterChannelSalesListComponent, - data: { guard: { ability: ['channelSales-search'] } } }, + { path: '', component: ParterChannelSalesListComponent, data: { guard: { ability: ['channelSales-search'] } } }, { path: 'list', component: ParterChannelSalesListComponent }, { path: 'edit', component: ParterChannelSalesEditComponent } ] @@ -75,10 +74,8 @@ const routes: Routes = [ { path: 'level-config', children: [ - { path: '', component: ParterLevelConfigListComponent, - data: { guard: { ability: ['LevelConfig-search'] } } }, - { path: 'list', component: ParterLevelConfigListComponent , - data: { guard: { ability: ['LevelConfig-search'] } } }, + { path: '', component: ParterLevelConfigListComponent, data: { guard: { ability: ['LevelConfig-search'] } } }, + { path: 'list', component: ParterLevelConfigListComponent, data: { guard: { ability: ['LevelConfig-search'] } } }, { path: 'edit', component: ParterLevelConfigEditComponent } ] }, @@ -154,7 +151,7 @@ const routes: Routes = [ { path: 'scrollimg', children: [ - { path: '', component: ScrollImgComponentsListComponent }, + { path: '', component: ScrollImgComponentsListComponent, data: { guard: { ability: ['scrollimg-search'] } } }, { path: 'list', component: ScrollImgComponentsListComponent, data: { guard: { ability: ['scrollimg-search'] } } }, { path: 'detail', component: ScrollimgComponentsAddComponent } ] From b0d4a528696b7cd89a3f102e8cb75437c5ab5c07 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 5 May 2022 14:05:15 +0800 Subject: [PATCH 06/11] fix bug --- proxy.conf.js | 4 ++-- .../rebate-setting/add/add.component.ts | 24 +++++++++++++++---- .../rebate-table/rebate-table.component.ts | 2 -- 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 50eec04b..e26e2071 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-28 16:08:43 + * @LastEditTime : 2022-05-05 13:51:19 * @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/rebate-management/components/rebate-setting/add/add.component.ts b/src/app/routes/partner/rebate-management/components/rebate-setting/add/add.component.ts index 262e6397..1b3a47a4 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-29 16:23:18 + * @LastEditTime : 2022-05-05 14:04:53 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\add\\add.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -155,21 +155,35 @@ export class ParterRebateManageMentAddComponent implements OnInit { this.service.msgSrv.warning('请选择合伙人范围！'); return } + if(!this.priority) { + this.service.msgSrv.warning('请选择优先级！'); + return + } + if(!this.sf?.value.ruleDescription) { + this.service.msgSrv.warning('请输入规则说明！'); + return + } + if(!this.remark) { + this.service.msgSrv.warning('请输入备注！'); + return + } if(this.partnerType == '3' && this.partnerPeopleList?.length == 0) { this.service.msgSrv.warning('请选择合伙人！'); return } let real = false; + if(this.configType == '2') { this.table.data.forEach((element: any) => { if (element.startAmount > element.endAmount) { real = true; return; } }); - // if (real) { - // this.service.msgSrv.warning('初始业务量不能超过到达业务量！'); - // return; - // } + } + if (real) { + this.service.msgSrv.warning('初始业务量不能超过到达业务量！'); + return; + } const params = { accountingRate: this.accountingRate, diff --git a/src/app/shared/components/rebate-table/rebate-table.component.ts b/src/app/shared/components/rebate-table/rebate-table.component.ts index 0e6581fc..cf5f8e30 100644 --- a/src/app/shared/components/rebate-table/rebate-table.component.ts +++ b/src/app/shared/components/rebate-table/rebate-table.component.ts @@ -43,8 +43,6 @@ export class RebateTableComponent implements OnInit { this.data = [ { gradeConfigId: '0', - startAmount: 0, - endAmount: 0, managementFeeRatio: 0, } ]; From c80e7aedc2dde6c6a50ba4a52ef9cd38db45c868 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 5 May 2022 14:15:01 +0800 Subject: [PATCH 07/11] fix bug --- .../partner/channel-sales/components/edit/edit.component.html | 4 ++-- .../partner/channel-sales/components/list/list.component.ts | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/routes/partner/channel-sales/components/edit/edit.component.html b/src/app/routes/partner/channel-sales/components/edit/edit.component.html index 7386c7af..39fa35c5 100644 --- a/src/app/routes/partner/channel-sales/components/edit/edit.component.html +++ b/src/app/routes/partner/channel-sales/components/edit/edit.component.html @@ -1,5 +1,5 @@ - - + +
    diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.ts b/src/app/routes/partner/channel-sales/components/list/list.component.ts index 613a7da2..65038521 100644 --- a/src/app/routes/partner/channel-sales/components/list/list.component.ts +++ b/src/app/routes/partner/channel-sales/components/list/list.component.ts @@ -132,6 +132,7 @@ export class ParterChannelSalesListComponent implements OnInit { { text: '冻结', acl: { ability: ['channelSales-frozen'] }, + iif: (item) => {return item.stateLocked == false}, click: (_record, _modal, _instance) => this.stop(_record), } ] From cbef5df450b8f35e70b16acd2674e78dc3cab40e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 5 May 2022 14:16:17 +0800 Subject: [PATCH 08/11] fix bug --- .../partner/channel-sales/components/list/list.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/routes/partner/channel-sales/components/list/list.component.ts b/src/app/routes/partner/channel-sales/components/list/list.component.ts index 65038521..8c971305 100644 --- a/src/app/routes/partner/channel-sales/components/list/list.component.ts +++ b/src/app/routes/partner/channel-sales/components/list/list.component.ts @@ -127,6 +127,7 @@ export class ParterChannelSalesListComponent implements OnInit { { text: '编辑', acl: { ability: ['channelSales-edit'] }, + iif: (item) => {return item.stateLocked == false}, click: (_record, _modal, _instance) => this.edit(_record), }, { From 20f116053c477dce6d3439fd7031324acfac9bfe Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 5 May 2022 14:16:37 +0800 Subject: [PATCH 09/11] UI --- .../usercenter/components/freight/list/list.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index a26b9fd2..57f8ef54 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -25,7 +25,7 @@
    - +
    @@ -98,4 +98,4 @@
    - --> + --> \ No newline at end of file From 53c814ed922a62376731aa6881a078811111c6ff Mon Sep 17 00:00:00 2001 From: wangshiming Date: Thu, 5 May 2022 14:18:44 +0800 Subject: [PATCH 10/11] fix bug --- .../usercenter/components/freight/list/list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index a26b9fd2..694b29d8 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -25,7 +25,7 @@
    - +
    From 8505c7f4079933c97bbadccb397271fcaa4b42f1 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Thu, 5 May 2022 14:20:08 +0800 Subject: [PATCH 11/11] UI --- .../usercenter/components/freight/list/list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/usercenter/components/freight/list/list.component.html b/src/app/routes/usercenter/components/freight/list/list.component.html index 57f8ef54..018efd10 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.html +++ b/src/app/routes/usercenter/components/freight/list/list.component.html @@ -51,7 +51,7 @@ + [res]="{ process: dataProcess }" [scroll]="{ x: '1200px',y:scrollY }" [page]=" {}" [loading]="loadingList">