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

车辆接口更新

Browse Source
This commit is contained in:
wangshiming
2022-01-20 16:26:08 +08:00
parent 9232c4cc0e
commit 60544b8896
9 changed files with 121 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/routes/financial-management/components/payable-order/payable-order.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-14 14:39:04
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 16:20:54
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payable-order\\payable-order.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'应付核销'">
</page-header-wrapper>
@ -12,8 +22,8 @@
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</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>
<!-- <button nz-button [disabled]="service.http.loading"> 导出</button>
<button nz-button [disabled]="service.http.loading"> 导出核销</button> -->
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>

12
src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.html
View File

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-19 16:54:07
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 16:22:55
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\payment-order\\payment-order-detail\\payment-order-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'付款单'" [logo]="logo">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@ -27,7 +37,7 @@
{{headerInfo?.payDate}}
</se>
<se label="收款账户" required>
{{headerInfo?.hrBankNo}}
{{headerInfo?.payBankTypeLabel}}
</se>
<se label="确认日期" required>
{{headerInfo?.payDate2}}

5
src/app/routes/financial-management/components/payment-order/payment-order-detail/payment-order-detail.component.ts
View File

@ -40,6 +40,7 @@ export class PaymentOrderDetailComponent implements OnInit {
if (this.sf) {
Object.assign(requestOptions.body, {
...this.sf.value,
payHId: this.id,
billTime: {
start: this.sf.value.billTime?.[0] || null,
end: this.sf.value.billTime?.[1] || null
@ -49,6 +50,10 @@ export class PaymentOrderDetailComponent implements OnInit {
end: this.sf.value.feedate?.[1] || null
}
});
} else {
Object.assign(requestOptions.body, {
payHId: this.id,
});
}
return requestOptions;
};

4
src/app/routes/financial-management/components/receipt-order/receipt-order-detail/receipt-order-detail.component.html
View File

@ -59,7 +59,7 @@
<nz-card class="content-box" nzBordered>
<nz-tabset>
<nz-tab nzTitle="核销信息">
<!-- <nz-tab nzTitle="核销信息">
<st #st [scroll]="{ x: '2000px' }" [data]="[]" [columns]="columns.cost" [page]="{ show: false }"
[loading]="service.http.loading" [scroll]="{ x: '1200px', y: '370px' }">
<ng-template st-row="hrvatmoney" let-item let-index="index">
@ -74,7 +74,7 @@
<ng-template st-row="no" let-item let-index="index" let-column="column">
</ng-template>
</st>
</nz-tab>
</nz-tab> -->
<nz-tab nzTitle="预收信息">
<st #st [scroll]="{ x: '2000px' }" [data]="service.$api_get_receipt_detail" [columns]="columns.requested"
[req]="{ method: 'POST', allInBody: true, process: beforeReq }" [res]="{ reName: { list: 'data' } }"

8
src/app/routes/financial-management/components/receipt-order/receipt-order.component.html
View File

@ -24,8 +24,8 @@
<div nz-col [nzXl]="_$expand ? 24 : 7" [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 (click)="resetSF()">重置</button>
<button nz-button nzType="primary"> 导出</button>
<button nz-button nzType="primary"> 导出核销</button>
<!-- <button nz-button nzType="primary"> 导出</button>
<button nz-button nzType="primary"> 导出核销</button> -->
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -36,8 +36,8 @@
<nz-card class="content-box" nzBordered>
<div class="d-flex align-items-center mb-md mt-md">
<button nz-button (click)="this.addInvoice()" nzType="primary">添加收款</button>
<button nz-button (click)="this.addInvoice()" nzType="primary">导入收款</button>
<!-- <button nz-button (click)="this.addInvoice()" nzType="primary">添加收款</button>
<button nz-button (click)="this.addInvoice()" nzType="primary">导入收款</button> -->
<div class="ml-md">
已选择
<strong class="text-primary">{{ selectedRows.length }}</strong> 张单

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

@ -269,9 +269,9 @@ export class ReceiptOrderComponent implements OnInit {
text: '浏览',
click: item => this.router.navigate(['/financial-management/receipt-order/detail/' + item.id])
},
{
text: '核销'
}
// {
// text: '核销'
// }
]
}
];

70
src/app/routes/financial-management/components/receivable-order/receivable-order.component.html
View File

@ -1,32 +1,50 @@
<page-header-wrapper [title]="'应收核销'">
</page-header-wrapper>
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-14 14:39:04
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 16:20:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\receivable-order\\receivable-order.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'应收核销'"> </page-header-wrapper>
<nz-card class="search-box" nzBordered>
<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>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</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>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
<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>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right" [class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</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> -->
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</div>
</nz-card>
<nz-card class="content-box" nzBordered>
<st #st [data]="service.$api_get_fico_page" [columns]="columns"
[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" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
</st>
</nz-card>
<st
#st
[data]="service.$api_get_fico_page"
[columns]="columns"
[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"
[scroll]="{ x: '1200px', y: '370px' }"
(change)="stChange($event)"
>
</st>
</nz-card>

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

@ -276,9 +276,9 @@ export class ReceivableOrderComponent implements OnInit {
click: item =>
this.router.navigate(['/financial-management/receivable-order/detail/' + item.id], { queryParams: { billHId: item.billHId } })
},
{
text: '核销'
}
// {
// text: '核销'
// }
]
}
];