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:
Taric Xin
2022-01-20 17:27:44 +08:00
parent 121fcce44c 7e498fe364
commit f638ba2682
36 changed files with 671 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,8 @@
{{ costInfo?.artocode}}/{{ costInfo?.artonames}}
</ng-template>
<ng-template st-row="hrvatmoney" let-item let-index="index">
{{ item.hrvatmoney | currency}}
<span *ngIf="!textStatus">{{ item.armoney | currency}}</span>
<span *ngIf="textStatus">{{ item.hrmoney | currency}}</span>
</ng-template>
<ng-template st-row="armoney" let-item let-index="index">
{{ item.armoney | currency}}

9
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 10:20:32
* @LastEditTime : 2022-01-20 17:14:57
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\cost-management\\cost-management.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -19,8 +19,8 @@
<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 (click)="resetSF()">重置</button>
<button nz-button (click)="exportList()"> 导出</button>
<button nz-button (click)="exportList()"> 导出明细</button>
<!-- <button nz-button (click)="exportList()"> 导出</button>
<button nz-button (click)="exportList()"> 导出明细</button> -->
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -51,7 +51,8 @@
{{ item.hrmoney | currency}}
</ng-template>
<ng-template st-row="artocode" let-item let-index="index">
{{ item.artocode}}/{{ item.artonames}}
<span *ngIf="item.feetype == 1">{{ item.artocode}}/{{ item.artonames}}</span>
<span *ngIf="item.feetype == 2">{{ item.hrtocode}}/{{ item.hrtonames}}</span>
</ng-template>
<ng-template st-row="hrpaymoney" let-item let-index="index">
{{ item.hrpaymoney | currency}}

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>

20
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:57:24
* @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()">
@ -13,13 +23,13 @@
{{headerInfo?.ltdName}}
</se>
<se label="收款人" required>
{{headerInfo?.hrToName}}
{{headerInfo?.payBankTypeLabel}}
</se>
<se label="付款账户" required>
{{headerInfo?.ltdAccountId}}
</se>
<se label="应付已核销" required>
{{headerInfo?.invdate}}
{{headerInfo?.payMoney}}
</se>
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
@ -27,10 +37,10 @@
{{headerInfo?.payDate}}
</se>
<se label="收款账户" required>
{{headerInfo?.hrBankNo}}
{{headerInfo?.payBankTypeLabel}}
</se>
<se label="确认日期" required>
{{headerInfo?.payDate2}}
{{headerInfo?.payDate}}
</se>
<se label="付款备注">
{{headerInfo?.payRemarks}}
@ -41,7 +51,7 @@
{{headerInfo?.payModeLabel}}
</se>
<se label="付款类型" required>
{{headerInfo?.payTypeLabel}}
{{headerInfo?.payType}}
</se>
<se label="付款金额" required>
{{headerInfo?.payMoney |currency}}

48
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;
};
@ -81,13 +86,13 @@ export class PaymentOrderDetailComponent implements OnInit {
hidden: true
}
},
feeHCode: {
type: 'string',
title: '费用单号',
ui: {
placeholder: '请输入'
}
},
// feeHCode: {
// type: 'string',
// title: '费用单号',
// ui: {
// placeholder: '请输入'
// }
// },
billHCode: {
type: 'string',
title: '订单号',
@ -102,26 +107,23 @@ export class PaymentOrderDetailComponent implements OnInit {
placeholder: '请输入'
}
},
feedate: {
title: '费用日期',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
// feedate: {
// title: '费用日期',
// type: 'string',
// ui: {
// widget: 'sl-from-to-search',
// format: 'yyyy-MM-dd',
// visibleIf: {
// expand: (value: boolean) => value
// }
// } as SFDateWidgetSchema
// },
billTime: {
title: '订单日期',
type: 'string',
ui: {
widget: 'sl-from-to-search',
format: 'yyyy-MM-dd',
visibleIf: {
expand: (value: boolean) => value
}
} as SFDateWidgetSchema
},
cno: {
@ -144,8 +146,8 @@ export class PaymentOrderDetailComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '序号', render: 'billHCode', width: 80 },
{ title: '费用号', index: 'feeHCode', width: 100 },
{ title: '费用日期', index: 'feedate', type: 'date', width: 150 },
// { title: '费用号', index: 'feeHCode', width: 100 },
// { title: '费用日期', index: 'feedate', type: 'date', width: 150 },
{ title: '订单号', index: 'billHCode', width: 100 },
{ title: '订单日期', index: 'billTime', width: 150 },
{ title: '结算客户', index: 'cnoName', width: 90 },

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

@ -12,8 +12,8 @@
[class.expend-options]="_$expand">
<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>
@ -25,8 +25,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> 张单

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

@ -235,15 +235,15 @@ export class PaymentOrderComponent implements OnInit {
width: 120,
type: 'widget',
className: 'text-right',
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.paymoney }) }
widget: { type: 'currency-chy', params: ({ record }) => ({ value: record.payMoney }) }
},
{ title: '付款类型', index: 'payTypeLabel', width: 130 },
{ title: '付款类型', index: 'payType', width: 130 },
{ title: '付款方式', index: 'payModeLabel', width: 130 },
{ title: '结算客户', index: 'shipperId', width: 160 },
{ title: '收款人', index: 'hrToName', width: 150 },
{ title: '应付已核销', index: 'callNo', width: 150 },
{ title: '确认日期', index: 'payDate2', type: 'date', className: 'text-center', width: 150 },
{ title: '创建时间', index: 'createTime', type: 'date', className: 'text-center', width: 150 },
{ title: '确认日期', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
{ title: '创建时间', index: 'payDate', type: 'date', className: 'text-center', width: 150 },
{ title: '创建人', index: 'createUserId', width: 160 },
{ title: '付款备注', index: 'payRemarks', width: 200 },
{
@ -256,9 +256,9 @@ export class PaymentOrderComponent implements OnInit {
text: '浏览',
click: item => this.router.navigate(['/financial-management/payment-order/detail/' + item.id])
},
{
text: '修改',
}
// {
// text: '修改',
// }
]
}
];

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: '核销'
// }
]
}
];

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

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 17:03:34
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-detail\\voucher-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()">
@ -9,10 +19,10 @@
<nz-card>
<div se-container labelWidth="150" gutter="32" col="3">
<se-title class="text-center font-weight-bold text-xl">记账凭证
<button nz-button nzType="primary" [nzLoading]="service.http.loading" style="float: right;">打印</button>
<!-- <button nz-button nzType="primary" [nzLoading]="service.http.loading" style="float: right;">打印</button> -->
</se-title>
<se label="帐套" required>
{{info?.vcltdcode}}
{{info?.ltdId}}
</se>
<se label="凭证类型" required>
{{info?.vctype}}
@ -46,7 +56,7 @@
{{info?.remarks}}
</sv>
<sv label="凭证流水号">
{{info?.createUserId}}
{{info?.id}}
</sv>
<sv label="创建人">
{{info?.createUserId}}

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

@ -11,7 +11,7 @@ import { FreightAccountService } from '../../../services/freight-account.service
export class VoucherDetailComponent implements OnInit {
columns: STColumn[] = [
{ title: '摘要', index: 'remarks' },
{ title: '会计科目', index: 'subname' },
{ title: '会计科目', index: 'subcode' },
{ title: '辅助核算', render: 'auxVOList' },
{ title: '币种', index: 'currency', className: 'text-center' },
{

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

@ -11,8 +11,8 @@
<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 [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>
@ -24,13 +24,13 @@
<nz-card class="content-box" nzBordered>
<div class="d-flex align-items-center mb-md mt-md">
<button nz-button nzType="primary">新建凭证</button>
<!-- <button nz-button nzType="primary">新建凭证</button>
<button nz-button nzType="primary">凭证导入</button>
<div class="ml-md">
已选择
<strong class="text-primary">{{ selectedRows.length }}</strong> 张发票
<a *ngIf="selectedRows.length > 0" (click)="st.clearCheck()" class="ml-lg">清空</a>
</div>
</div> -->
</div>
<st #st [data]="service.$api_get_fico_vch_page" [columns]="columns"

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

@ -1,3 +1,13 @@
/*
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-18 15:57:44
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 17:18:16
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-management\\voucher-management.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { CurrencyPipe } from '@angular/common';
import { Component, OnInit, ViewChild } from '@angular/core';
import { Router } from '@angular/router';
@ -283,11 +293,11 @@ export class VoucherManagementComponent implements OnInit {
private initST(): STColumn[] {
return [
{ title: '', index: 'key', type: 'checkbox', width: 60, className: 'text-center', fixed: 'left' },
{ title: '凭证号', index: 'id', type: 'link', width: 150 },
{ title: '帐套', index: 'vcltdid', width: 150 },
{ title: '凭证时间', index: 'vctime', type: 'date', width: 150 },
{ title: '凭证类型', index: 'vctypeLabel', width: 150 },
{ title: '序号', index: 'invmoney', width: 150, format: _ => '1' },
{ title: '凭证号', index: 'id', type: 'link', width: 200 },
{ title: '帐套', index: 'ltdId', width: 200 },
{ title: '凭证时间', index: 'vctime', type: 'date', width: 200 },
{ title: '凭证类型', index: 'vctype', width: 200 },
{ title: '序号', index: 'invmoney', width: 200, format: _ => '1' },
{ title: '摘要', index: 'remarks', width: 300 },
{ title: '币种', index: 'currency', width: 100 },
{
@ -320,15 +330,15 @@ export class VoucherManagementComponent implements OnInit {
text: '浏览',
click: (item: any) => this.router.navigate(['/financial-management/voucher-management/detail/' + item.id])
},
{
text: '修改'
},
{
text: '删除'
},
{
text: '提交'
}
// {
// text: '修改'
// },
// {
// text: '删除'
// },
// {
// text: '提交'
// }
]
}
];

2
src/app/routes/financial-management/components/voucher-summary/voucher-list/voucher-list.component.ts
View File

@ -186,7 +186,7 @@ export class VoucherListComponent implements OnInit {
{ title: '凭证号', index: 'id', type: 'link', width: 150 },
{ title: '帐套', index: 'vcltdid', width: 150 },
{ title: '凭证时间', index: 'vctime', type: 'date', width: 150 },
{ title: '凭证类型', index: 'vctypeLabel', width: 150 },
{ title: '凭证类型', index: 'vctype', width: 150 },
{ title: '序号', index: 'invmoney', width: 150, format: _ => '1' },
{ title: '摘要', index: 'remarks', width: 300 },
{ title: '币种', index: 'currency', width: 100 },

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

@ -1,3 +1,13 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-18 15:57:44
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 15:23:44
* @FilePath : \\tms-obc-web\\src\\app\\routes\\financial-management\\components\\voucher-summary\\voucher-summary.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'凭证汇总'">
</page-header-wrapper>
@ -11,9 +21,9 @@
<div nz-col [nzXl]="_$expand ? 24 : 8" [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 [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="primary" [disabled]="service.http.loading"> 导出</button>
<!-- <button nz-button nzType="primary" [disabled]="service.http.loading"> 导出</button>
<button nz-button nzType="primary" [disabled]="service.http.loading"> 导出明细</button>
<button nz-button nzType="primary" [disabled]="service.http.loading"> 导出凭证</button>
<button nz-button nzType="primary" [disabled]="service.http.loading"> 导出凭证</button> -->
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>