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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
潘晓云
2022-04-28 15:34:21 +08:00
parent e233980308 7c4b440e8e
commit e43a351dd6
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/routes/insurance-management/insurance-management-routing.module.ts
View File

@ -13,13 +13,12 @@ import { RouterModule, Routes } from '@angular/router';
import { insuranceManagementListComponent } from './components/list/list.component'; import { insuranceManagementListComponent } from './components/list/list.component';
import { insuranceManagementSetComponent } from './components/set/set.component'; import { insuranceManagementSetComponent } from './components/set/set.component';
const routes: Routes = [ const routes: Routes = [
{ path: 'list', component: insuranceManagementListComponent }, { path: 'list', component: insuranceManagementListComponent, data: { guard: { ability: ['INSURANCE-LIST-search'] } } },
{ path: 'list-set', component: insuranceManagementSetComponent }, { path: 'list-set', component: insuranceManagementSetComponent, data: { guard: { ability: ['INSURANCE-LISTDETAIL-set'] } } }
] ];
@NgModule({ @NgModule({
imports: [RouterModule.forChild(routes)], imports: [RouterModule.forChild(routes)],
exports: [RouterModule] exports: [RouterModule]
}) })
export class InsuranceManagementRoutingModule { } export class InsuranceManagementRoutingModule {}

18
src/app/routes/sys-setting/components/goods-name-config/goods-name-config.component.html
View File

@ -14,10 +14,14 @@
</div> </div>
<nz-dropdown-menu #menu="nzDropdownMenu"> <nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu nzSelectable> <ul nz-menu nzSelectable>
<li nz-menu-item (click)="typeAction(item)">编辑</li> <li nz-menu-item (click)="typeAction(item)" acl
<li nz-menu-item (click)="sortType(item,3)" *ngIf="i!==0">上移</li> [acl-ability]="['SYSTEM-GOODS-NAME-CONFIG-edit']">编辑</li>
<li nz-menu-item (click)="sortType(item,4)" *ngIf="i!==typeList.length-1">下移</li> <li nz-menu-item (click)="sortType(item,3)" acl
<li nz-menu-item nzDanger (click)="removeType(item)">删除</li> [acl-ability]="['SYSTEM-GOODS-NAME-CONFIG-sort']" *ngIf="i!==0">上移</li>
<li nz-menu-item (click)="sortType(item,4)" acl
[acl-ability]="['SYSTEM-GOODS-NAME-CONFIG-sort']" *ngIf="i!==typeList.length-1">下移</li>
<li nz-menu-item nzDanger acl [acl-ability]="['SYSTEM-GOODS-NAME-CONFIG-delete']"
(click)="removeType(item)">删除</li>
</ul> </ul>
</nz-dropdown-menu> </nz-dropdown-menu>
</nz-list-item> </nz-list-item>
@ -25,7 +29,8 @@
<ng-template #listHeader> <ng-template #listHeader>
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
<label style="font-weight: 700;font-size: 16px;">货物类型</label> <label style="font-weight: 700;font-size: 16px;">货物类型</label>
<button nz-button nzType="primary" (click)="typeAction()"><i nz-icon nzType="plus" <button nz-button nzType="primary" (click)="typeAction()" acl
[acl-ability]="['SYSTEM-GOODS-NAME-CONFIG-add']"><i nz-icon nzType="plus"
nzTheme="outline"></i>新增</button> nzTheme="outline"></i>新增</button>
</div> </div>
</ng-template> </ng-template>
@ -39,7 +44,8 @@
</nz-input-group> </nz-input-group>
<ng-template #suffixTemplateInfo><i nz-icon nzType="search" nzTheme="outline" (click)="st.load(1)"></i> <ng-template #suffixTemplateInfo><i nz-icon nzType="search" nzTheme="outline" (click)="st.load(1)"></i>
</ng-template> </ng-template>
<button nz-button nzType="primary" (click)="typeItemAction()"><i nz-icon nzType="plus" <button nz-button nzType="primary" (click)="typeItemAction()" acl
[acl-ability]="['SYSTEM-GOODS-NAME-CONFIG-add']"><i nz-icon nzType="plus"
nzTheme="outline"></i>新增</button> nzTheme="outline"></i>新增</button>
</div> </div>

4
src/app/routes/sys-setting/components/goods-name-config/goods-name-config.component.ts
View File

@ -28,18 +28,22 @@ export class GoodsNameConfigComponent implements OnInit {
buttons: [ buttons: [
{ {
text: '编辑', text: '编辑',
acl: { ability: ['SYSTEM-GOODS-NAME-CONFIG-edit'] },
click: item => this.typeItemAction(item) click: item => this.typeItemAction(item)
}, },
{ {
text: '上移', text: '上移',
acl: { ability: ['SYSTEM-GOODS-NAME-CONFIG-sort'] },
click: item => this.sortTypeItem(item, 3) click: item => this.sortTypeItem(item, 3)
}, },
{ {
text: '下移', text: '下移',
acl: { ability: ['SYSTEM-GOODS-NAME-CONFIG-sort'] },
click: item => this.sortTypeItem(item, 4) click: item => this.sortTypeItem(item, 4)
}, },
{ {
text: '删除', text: '删除',
acl: { ability: ['SYSTEM-GOODS-NAME-CONFIG-delete'] },
click: item => this.removeTypeItem(item) click: item => this.removeTypeItem(item)
} }
] ]