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/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..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,11 +127,13 @@ export class ParterChannelSalesListComponent implements OnInit { { text: '编辑', acl: { ability: ['channelSales-edit'] }, + iif: (item) => {return item.stateLocked == false}, click: (_record, _modal, _instance) => this.edit(_record), }, { text: '冻结', acl: { ability: ['channelSales-frozen'] }, + iif: (item) => {return item.stateLocked == false}, click: (_record, _modal, _instance) => this.stop(_record), } ] 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 } ] 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/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 @@ - - - - - - + +
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 }, 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..5b95b4a7 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 @@ -365,8 +365,8 @@ - - + + + - - - + --> + + - +
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 c7f1462b..018efd10 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 @@
- +
@@ -38,12 +38,12 @@
  • 新增企业
    • -
  • +
    • @@ -51,7 +51,7 @@ + [res]="{ process: dataProcess }" [scroll]="{ x: '1200px',y:scrollY }" [page]=" {}" [loading]="loadingList">
    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 68658f98..a1d88f29 100644 --- a/src/app/routes/usercenter/components/freight/list/list.component.ts +++ b/src/app/routes/usercenter/components/freight/list/list.component.ts @@ -467,14 +467,14 @@ export class FreightComponentsListComponent extends BasicTableComponent implemen 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) + // } ] } ]; 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, } ];