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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-27 14:13:36 +08:00
parent aad0b9d461
commit 527d8305c1
4 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-03-28 14:53:52 * @Date : 2022-03-28 14:53:52
* @LastEditors : Shiming * @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 * @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. * 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" [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }" [loading]="false"
[scroll]="{ x: '1000' }"> [scroll]="{ x: '1000' }">
</st> </st>
<button style="float: right;" *ngIf="selectedIndex===0" (click)="batchReply()" nz-button nzType="primary" acl <button style="float: right;" *ngIf="selectedIndex===0" (click)="batchReply()" nz-button nzType="primary">批量选择</button>
[acl-ability]="['AbnormalAppear-batchReply']">批量选择</button>
</nz-card> </nz-card>

1
src/app/routes/partner/rebate-management/components/rebate-setting/add-partnerlist/add-partnerlist.component.ts
View File

@ -55,7 +55,6 @@ export class ParterRebateManageMentAddPartnerListComponent implements OnInit {
{ {
text: '添加', text: '添加',
click: _record => this.add(_record), click: _record => this.add(_record),
acl: { ability: ['AbnormalAppear-reply'] }
} }
] ]
} }

21
src/app/shared/components/rebate-table/rebate-table.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-25 20:18:52 * @Date : 2022-01-25 20:18:52
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\rebate-table\\rebate-table.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -20,8 +20,8 @@
<tr> <tr>
<th rowspan="2" nzWidth="60px" nzAlign="center" nzLeft>序号</th> <th rowspan="2" nzWidth="60px" nzAlign="center" nzLeft>序号</th>
<th nzWidth="220px" nzAlign="center" >合伙人等级</th> <th nzWidth="220px" nzAlign="center" >合伙人等级</th>
<th nzWidth="160px" nzAlign="center" >初始业务量（万/月）</th> <th nzWidth="160px" *ngIf="type == '2'" nzAlign="center" >初始业务量（万/月）</th>
<th nzWidth="160px" nzAlign="center" >到达业务量（万/月）</th> <th nzWidth="160px" *ngIf="type == '2'" nzAlign="center" >到达业务量（万/月）</th>
<th nzWidth="160px" nzAlign="center" >管理费比例%</th> <th nzWidth="160px" nzAlign="center" >管理费比例%</th>
<th rowspan="2" nzWidth="60px" nzAlign="center" nzRight *ngIf="type == '2'">操作</th> <th rowspan="2" nzWidth="60px" nzAlign="center" nzRight *ngIf="type == '2'">操作</th>
</tr> </tr>
@ -45,7 +45,7 @@
</nz-select> </nz-select>
</div> </div>
</td> </td>
<td nzWidth="160px" nzAlign="center" > <td nzWidth="160px" nzAlign="center" *ngIf="type == '2'" >
<div > <div >
<nz-input-group nzPrefix="=" > <nz-input-group nzPrefix="=" >
<nz-input-number nzPrefix="=" [(ngModel)]="item.startAmount" [nzMin]="0" [nzMax]="99999999"nzSize="small" (ngModelChange)="changeendAmount($event,i)" <nz-input-number nzPrefix="=" [(ngModel)]="item.startAmount" [nzMin]="0" [nzMax]="99999999"nzSize="small" (ngModelChange)="changeendAmount($event,i)"
@ -55,7 +55,7 @@
</div> </div>
</td> </td>
<td nzWidth="160px" nzAlign="center" > <td nzWidth="160px" nzAlign="center" *ngIf="type == '2'" >
<div > <div >
<nz-input-group nzPrefix="＜"> <nz-input-group nzPrefix="＜">
<nz-input-number [(ngModel)]="item.endAmount" [nzMin]="0" [nzMax]="99999999" nzSize="small" > <nz-input-number [(ngModel)]="item.endAmount" [nzMin]="0" [nzMax]="99999999" nzSize="small" >
@ -64,15 +64,16 @@
</div> </div>
</td> </td>
<td nzWidth="160px" nzAlign="center" > <td nzWidth="160px" nzAlign="center" >
<div > <div class="three" style="text-align: center;">
<nz-input-group [nzAddOnAfter]="addOnAfterTemplate2"> <nz-input-group [nzAddOnAfter]="addOnAfterTemplate2">
<nz-input-number [(ngModel)]="item.managementFeeRatio" [nzMin]="0" [nzMax]="100"nzSize="small" <nz-input-number [(ngModel)]="item.managementFeeRatio" [nzMin]="0" [nzMax]="100"nzSize="small"
> >
<ng-template #addOnAfterTemplate2>
<span >%</span>
</ng-template>
</nz-input-number> </nz-input-number>
</nz-input-group> </nz-input-group>
<ng-template #addOnAfterTemplate2>
<span >%</span>
</ng-template>
</div> </div>
</td> </td>
<td nzWidth="60px" nzAlign="center" nzRight *ngIf="type == '2'"> <td nzWidth="60px" nzAlign="center" nzRight *ngIf="type == '2'">

3
src/app/shared/components/rebate-table/rebate-table.component.less
View File

@ -18,5 +18,8 @@
.ant-input-affix-wrapper { .ant-input-affix-wrapper {
border: none border: none
} }
.three .ant-input-affix-wrapper {
width: 50% !important;
}
} }