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

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-02-23 19:38:18 +08:00
parent c27874bb3f
commit f40c5a53a4
19 changed files with 520 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/app/routes/financial-management/components/cost-management/cost-management.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-30 19:36:30
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 17:14:57
* @LastEditTime : 2022-02-23 16:35:15
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -13,11 +13,16 @@
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true" [button]="'none'"></sf>
<sf
#sf
[schema]="searchSchema"
[ui]="{ '*': { spanLabelFixed: 110, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }"
[compact]="true"
[button]="'none'"
></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['FINANCIAL-COST-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<!-- <button nz-button (click)="exportList()"> 导出</button>
<button nz-button (click)="exportList()"> 导出明细</button> -->
@ -39,22 +44,26 @@
<button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button> -->
</div>
</div>
<st #st [data]="service.$api_get_cost_page" [columns]="columns" [req]="{ process: beforeReq }"
[loading]="service.http.loading" [scroll]="{ x: '2000px' }">
<st
#st
[data]="service.$api_get_cost_page"
[columns]="columns"
[req]="{ process: beforeReq }"
[loading]="service.http.loading"
[scroll]="{ x: '2000px' }"
>
<ng-template st-row="armoeny" let-item let-index="index">
{{ item.armoeny | currency}}
{{ item.armoeny | currency }}
</ng-template>
<ng-template st-row="hrmoney" let-item let-index="index">
{{ item.hrmoney | currency}}
</ng-template>
<ng-template st-row="artocode" let-item let-index="index">
{{ item.cnoCode}}/{{ item.cnoName}}
{{ item.hrmoney | currency }}
</ng-template>
<ng-template st-row="artocode" let-item let-index="index"> {{ item.cnoCode }}/{{ item.cnoName }} </ng-template>
<ng-template st-row="hrpaymoney" let-item let-index="index">
{{ item.hrpaymoney | currency}}
{{ item.hrpaymoney | currency }}
</ng-template>
<ng-template st-row="hrvatmoney" let-item let-index="index">
{{ item.hrvatmoney | currency}}
{{ item.hrvatmoney | currency }}
</ng-template>
</st>
</nz-card>
@ -63,9 +72,13 @@
<div nz-row nzGutter="8">
<div nz-col nzSpan="24" se-container [labelWidth]="80">
<se [col]="1" label="备注">
<textarea nz-input rows="3" placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
style="width: 325px; margin-left: 14px"></textarea>
<textarea
nz-input
rows="3"
placeholder="同意可以不用填写原因 ，拒绝必须说明原因"
style="width: 325px; margin-left: 14px"
></textarea>
</se>
</div>
</div>
</ng-template>
</ng-template>

6
src/app/routes/financial-management/components/cost-management/cost-management.component.ts
View File

@ -299,12 +299,14 @@ export class CostManagementComponent implements OnInit {
buttons: [
{
text: '浏览',
click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id, { status: item?.feetypeLabel })
click: item => this.routeTo('/financial-management/cost-management/detail/' + item.id, { status: item?.feetypeLabel }),
acl: { ability: ['FINANCIAL-COST-view'] },
},
{
text: '审核',
click: item => this.auditAction(item),
iif: item => item.sts === 2
iif: item => item.sts === 2,
acl: { ability: ['FINANCIAL-COST-audit'] },
}
// {
// text: '修改',

2
src/app/routes/financial-management/components/voucher-management/voucher-management.component.html
View File

@ -9,7 +9,7 @@
[button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['FINANCIAL-VOUCHER-list']">查询</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<!-- <button nz-button [disabled]="service.http.loading"> 导出</button>
<button nz-button [disabled]="service.http.loading"> 导出明细</button> -->

3
src/app/routes/financial-management/components/voucher-management/voucher-management.component.ts
View File

@ -328,7 +328,8 @@ export class VoucherManagementComponent implements OnInit {
buttons: [
{
text: '浏览',
click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id])
click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id]),
acl: { ability: ['FINANCIAL-VOUCHER-view'] },
},
// {
// text: '修改'