解决冲突
This commit is contained in:
@ -30,7 +30,7 @@
|
||||
</div>
|
||||
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
|
||||
<button nz-button nzType="primary" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
|
||||
(click)="st?.load(1)">查询</button>
|
||||
(click)="st?.load(1)" acl [acl-ability]="['CONTRACT-INDEX-searchDetail']">查询</button>
|
||||
<button nz-button (click)="resetSF()">重置</button>
|
||||
<button nz-button nzType="link" (click)="expandToggle()">
|
||||
{{ !_$expand ? '展开' : '收起' }}
|
||||
|
||||
@ -153,18 +153,6 @@ export class ContractManagementContractListComponent implements OnInit {
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
// signTime: {
|
||||
// title: '签署日期',
|
||||
// type: 'string',
|
||||
// ui: {
|
||||
// widget: 'date',
|
||||
// mode: 'range',
|
||||
// format: 'yyyy-MM-dd',
|
||||
// visibleIf: {
|
||||
// _$expand: (value: boolean) => value,
|
||||
// },
|
||||
// } as SFDateWidgetSchema,
|
||||
// },
|
||||
signTime: {
|
||||
title: '签署日期',
|
||||
type: 'string',
|
||||
@ -196,11 +184,6 @@ export class ContractManagementContractListComponent implements OnInit {
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
approval(): void {}
|
||||
|
||||
add(): void {}
|
||||
|
||||
routeTo(item: any) {
|
||||
this.router.navigate(['/ticket/invoice-requested-detail/1']);
|
||||
}
|
||||
@ -246,7 +229,6 @@ export class ContractManagementContractListComponent implements OnInit {
|
||||
]
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
@ -254,7 +236,6 @@ export class ContractManagementContractListComponent implements OnInit {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user