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

fix bug

Browse Source
This commit is contained in:
Lingzi
2022-03-14 14:09:03 +08:00
parent 8805564acc
commit 98281b6b3a
124 changed files with 417 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -72,7 +72,7 @@
<nz-tabset>
<nz-tab nzTitle="费用明细">
<st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoFeeLList" [columns]="columns.cost"
[page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
[page]="{ show: false }" [loading]="false" [scroll]="{ x: '1200px', y: '370px' }">
<ng-template st-row="no" let-item let-index="index" let-column="column">
{{ index + 1 }}
</ng-template>
@ -104,7 +104,7 @@
</nz-tab>
<nz-tab nzTitle="开票信息">
<st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoVatappDatailList" [columns]="columns.requested"
[page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
[page]="{ show: false }" [loading]="false" [scroll]="{ x: '1200px', y: '370px' }">
<ng-template st-row="armoney" let-item let-index="index">
{{ item.armoney | currency}}
</ng-template>
@ -118,7 +118,7 @@
</nz-tab>
<nz-tab nzTitle="收款信息" *ngIf="!textStatus">
<st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoAhxLList" [columns]="columns.collection"
[page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
[page]="{ show: false }" [loading]="false" [scroll]="{ x: '1200px', y: '370px' }">
<ng-template st-row="ahxmoney" let-item let-index="index">
{{ item.ahxmoney | currency}}
</ng-template>
@ -133,11 +133,11 @@
</nz-tab>
<nz-tab nzTitle="收票信息">
<st #st [data]="data" [scroll]="{ x: '2000px' }" [columns]="columns.ticket" [page]="{ show: false }"
[loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }"></st>
[loading]="false" [scroll]="{ x: '1200px', y: '370px' }"></st>
</nz-tab>
<nz-tab nzTitle="付款信息" *ngIf="textStatus">
<st #st [scroll]="{ x: '2000px' }" [data]="costInfo?.ficoPhxLList" [columns]="columns.payment"
[page]="{ show: false }" [loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
[page]="{ show: false }" [loading]="false" [scroll]="{ x: '1200px', y: '370px' }">
<ng-template st-row="no" let-item let-index="index" let-column="column">
{{ index + 1 }}
</ng-template>

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

@ -17,7 +17,7 @@
[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)" acl
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)" acl
[acl-ability]="['FINANCIAL-COST-list']">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<!-- <button nz-button (click)="exportList()"> 导出</button>
@ -33,15 +33,15 @@
<nz-card class="content-box">
<div nz-row class="mb-sm">
<div nz-col nzSpan="24">
<!-- <button nz-button nzType="primary" [nzLoading]="service.http.loading"
<!-- <button nz-button nzType="primary" [nzLoading]="false"
(click)="routeTo('/financial-management/cost-management/expenses-receivable/1')">添加应收费用</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
<button nz-button nzType="primary" [nzLoading]="false"
(click)="routeTo('/financial-management/cost-management/expenses-payable/1')">添加应付费用</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading">导入费用</button> -->
<button nz-button nzType="primary" [nzLoading]="false">导入费用</button> -->
</div>
</div>
<st #st [data]="service.$api_get_cost_page" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[loading]="service.http.loading" [scroll]="{ x: '2000px' }">
[loading]="false" [scroll]="{ x: '2000px' }">
<ng-template st-row="armoeny" let-item let-index="index">
{{ item.armoeny | currency }}
</ng-template>

4
src/app/routes/financial-management/components/cost-management/expenses-payable/expenses-payable.component.html
View File

@ -8,7 +8,7 @@
<nz-card [nzExtra]="cardTemplate" nzTitle="基本信息">
<ng-template #cardTemplate>
<button nz-button nzType="primary" [nzLoading]="service.http.loading">保存</button>
<button nz-button nzType="primary" [nzLoading]="false">保存</button>
</ng-template>
<div nz-row nzGutter="8">
@ -18,7 +18,7 @@
</div>
</div>
<st #st [data]="data" [columns]="columns" [page]="{ show: false}" [loading]="service.http.loading" size="small"
<st #st [data]="data" [columns]="columns" [page]="{ show: false}" [loading]="false" size="small"
[scroll]="{ y: '370px' }" class="mt-sm">
<ng-template st-row="description1" let-item let-index="index">
<nz-select [ngModel]="item.description" (ngModelChange)="st.setRow(index, { description: $event })"

4
src/app/routes/financial-management/components/cost-management/expenses-receivable/expenses-receivable.component.html
View File

@ -18,7 +18,7 @@
<nz-card [nzExtra]="cardTemplate" nzTitle="基本信息">
<ng-template #cardTemplate>
<button nz-button nzType="primary" [nzLoading]="service.http.loading">保存</button>
<button nz-button nzType="primary" [nzLoading]="false">保存</button>
</ng-template>
<div nz-row nzGutter="8">
@ -28,7 +28,7 @@
</div>
</div>
<st #st [data]="data" [columns]="columns" [page]="{ show: false}" [loading]="service.http.loading" size="small"
<st #st [data]="data" [columns]="columns" [page]="{ show: false}" [loading]="false" size="small"
[scroll]="{ y: '370px' }" class="mt-sm">
<ng-template st-row="description1" let-item let-index="index">
<nz-select [ngModel]="item.description" (ngModelChange)="st.setRow(index, { description: $event })"