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:
wangshiming
2022-03-04 10:47:01 +08:00
parent 3ae4aa04e2 779c29fe6c
commit 3b884de222
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/app/routes/financial-management/components/payable-order/payable-order-detail/payable-order-detail.component.ts
View File

@ -41,7 +41,7 @@ export class PayableOrderDetailComponent implements OnInit {
} }
beforeReq = (requestOptions: STRequestOptions) => { beforeReq = (requestOptions: STRequestOptions) => {
Object.assign(requestOptions.body, { billHId: this.billHId }); Object.assign(requestOptions.body, { phxHId: this.billHId });
if (this.sf) { if (this.sf) {
Object.assign(requestOptions.body, { Object.assign(requestOptions.body, {
...this.sf.value, ...this.sf.value,
@ -159,14 +159,14 @@ export class PayableOrderDetailComponent implements OnInit {
private initST(): STColumn[] { private initST(): STColumn[] {
return [ return [
{ title: '序号', render: 'no', width: 80 }, { title: '序号', render: 'no', width: 80 },
{ title: '费用号', index: 'feeHCode', width: 100 }, { title: '费用号', index: 'feeHCode', width: 140 },
{ title: '费用日期', index: 'feedate', type: 'date', width: 150 }, { title: '费用日期', index: 'feedate', type: 'date', width: 150 },
{ title: '订单号', index: 'billHCode', width: 100 }, { title: '订单号', index: 'billHCode', width: 140 },
{ title: '订单日期', index: 'billTime', width: 150 }, { title: '订单日期', index: 'billTime', width: 150 },
{ title: '费用类型', index: 'feetype', width: 90 }, { title: '费用类型', index: 'feetype', width: 90 },
{ title: '订单费用科目', index: 'billLTypeLabel', width: 100 }, { title: '订单费用科目', index: 'billLTypeLabel', width: 100 },
{ title: '费用科目', index: 'feeSubIdName', width: 140 }, { title: '费用科目', index: 'feeSubIdName', width: 140 },
{ title: '结算客户', index: 'cnoName', width: 100 }, { title: '结算客户', index: 'cnoName', width: 140 },
{ {
title: '已收金额', title: '已收金额',
index: 'phxmoney', index: 'phxmoney',

2
src/app/routes/financial-management/components/payable-order/payable-order.component.ts
View File

@ -263,7 +263,7 @@ export class PayableOrderComponent implements OnInit {
{ {
text: '浏览', text: '浏览',
click: item => click: item =>
this.router.navigate(['/financial-management/payable-order/detail/' + item.id], { queryParams: { billHId: item.billHId } }) this.router.navigate(['/financial-management/payable-order/detail/' + item.id], { queryParams: { billHId: item.id } })
} }
] ]
} }