Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-05-11 17:11:09 +08:00
parent 6f10cf0e42
commit 7aa7da4480
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-02-24 20:09:49 * @Date : 2022-02-24 20:09:49
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-setting\\rebate-setting.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -58,7 +58,7 @@
<div *ngIf="item.partnerType == 3">自定义合伙人</div> <div *ngIf="item.partnerType == 3">自定义合伙人</div>
</ng-template> </ng-template>
<ng-template st-row='stateLocked' let-item let-index='index'> <ng-template st-row='stateLocked' let-item let-index='index'>
<div >{{item?.stateLocked ? '生效中' : '失效'}}</div> <div >{{item?.stateLocked ? '失效' : '生效中'}}</div>
</ng-template> </ng-template>
</st> </st>
</nz-card> </nz-card>

8
src/app/routes/partner/rebate-management/components/rebate-setting/rebate-setting.component.ts
View File

@ -53,8 +53,8 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
title: '状态', title: '状态',
enum: [ enum: [
{ label: '全部', value: '' }, { label: '全部', value: '' },
{ label: '生效中', value: 1 }, { label: '生效中', value: 0 },
{ label: '失效', value: 0 } { label: '失效', value: 1 }
], ],
ui: { ui: {
widget: 'select' widget: 'select'
@ -127,7 +127,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
text: '禁用', text: '禁用',
acl: { ability: ['REBATE-SETTING-forbidden'] }, acl: { ability: ['REBATE-SETTING-forbidden'] },
iif: _record => { 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) click: _record => this.viewEvaluate(_record)
}, },
@ -135,7 +135,7 @@ export class ParterRebateManageMentSettingComponent implements OnInit {
text: '启用', text: '启用',
acl: { ability: ['REBATE-SETTING-startUseing'] }, acl: { ability: ['REBATE-SETTING-startUseing'] },
iif: _record => { iif: _record => {
return _record.stateLocked == false; return _record.stateLocked == true;
}, },
click: _record => this.viewEvaluate(_record) click: _record => this.viewEvaluate(_record)
} }

2
src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts
View File

@ -294,7 +294,7 @@ export class TaxManagementOrderReportingComponent extends BasicTableComponent im
} else{ } else{
params =[] params =[]
this.selectedRows.forEach(item => { this.selectedRows.forEach(item => {
params.push(+item.id); params.push(item.billId);
}); });
} }