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:
TaricXin
2022-03-14 16:16:14 +08:00
parent 8a80a1de3c d2bad04985
commit afe542a6a0
129 changed files with 437 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.html
View File

@ -81,7 +81,7 @@
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -107,7 +107,7 @@
</div>
<st #st [data]="service.$api_get_invoice_requested_order_detail" [columns]="columns" [req]="{ process: beforeReq }" [page]="{}"
[res]="{ process: afterRes }" [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '200px' }"
[res]="{ process: afterRes }" [loading]="false" [scroll]="{ x:'1200px',y: '200px' }"
(change)="stChange($event)">
<ng-template st-row="billHCode" let-item let-index="index" let-column="column">
<a class="text-primary" (click)="routeToOrder(item)"> {{ item.billHCode }}</a>

4
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html
View File

@ -18,7 +18,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)">查询</button>
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
<button nz-button> 导出</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -53,7 +53,7 @@
</ng-template>
<st #st [data]="service.$api_get_invoice_requested_page" [columns]="columns" [req]="{ process: beforeReq }"
[page]="{}" [res]="{ process: afterRes }" [loading]="service.http.loading" [scroll]="{ x: '1200px' }"
[page]="{}" [res]="{ process: afterRes }" [loading]="false" [scroll]="{ x: '1200px' }"
(change)="stChange($event)">
<ng-template st-row="vatappcode" let-item let-index="index" let-column="column">
{{ item.vatappcode }} <br />

4
src/app/routes/ticket-management/components/invoice-requested/requested-invoice-modal/requested-invoice-modal.component.html
View File

@ -20,7 +20,7 @@
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading"
[loading]="false"
[scroll]="{ x: '1200px', y: '200px' }"
(change)="stChange($event)"
class="mt-md"
@ -32,5 +32,5 @@
<div class="modal-footer text-center">
<button nz-button type="button">移除</button>
<button nz-button type="button" (click)="saveManage()">手工处理</button>
<button nz-button type="submit" nzType="primary" [nzLoading]="service.http.loading" (click)="saveManage()">自动开票</button>
<button nz-button type="submit" nzType="primary" [nzLoading]="false" (click)="saveManage()">自动开票</button>
</div>