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 2d7ed4b7..07a11157 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-02-24 20:09:49 * @LastEditors : Shiming - * @LastEditTime : 2022-05-06 16:37:06 + * @LastEditTime : 2022-05-11 17:07:17 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -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 7efc2a2a..7b44d0ac 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 @@ -53,8 +53,8 @@ export class ParterRebateManageMentSettingComponent implements OnInit { title: '状态', enum: [ { label: '全部', value: '' }, - { label: '生效中', value: 1 }, - { label: '失效', value: 0 } + { label: '生效中', value: 0 }, + { label: '失效', value: 1 } ], ui: { widget: 'select' @@ -127,7 +127,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit { text: '禁用', acl: { ability: ['REBATE-SETTING-forbidden'] }, iif: _record => { - return _record.stateLocked == true && (_record.partnerType == 3 || _record.partnerType == 2); + return _record.stateLocked == false && (_record.partnerType == 3 || _record.partnerType == 2); }, click: _record => this.viewEvaluate(_record) }, @@ -135,7 +135,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit { text: '启用', acl: { ability: ['REBATE-SETTING-startUseing'] }, iif: _record => { - return _record.stateLocked == false; + return _record.stateLocked == true; }, click: _record => this.viewEvaluate(_record) } diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index c7bdb2d4..12237a9c 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -294,7 +294,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im } else{ params =[] this.selectedRows.forEach(item => { - params.push(+item.id); + params.push(item.billId); }); }