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-02-28 20:57:26 +08:00
parent 3088476b67 1253266e23
commit 317efcdb2a
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/routes/financial-management/components/refund-record/refund-record.component.ts
View File

@ -250,9 +250,9 @@ export class RefundRecordComponent implements OnInit {
private initST(): STColumn[] { private initST(): STColumn[] {
return [ return [
{ title: '退款单号', render: 'orderRefundCode', width: 190 }, { title: '退款单号', render: 'orderRefundCode', width: 190 },
{ title: '退款类型', index: 'refundTypeLabel', width: 130 }, { title: '退款类型', index: 'refundTypeLabel', width: 140 },
{ title: '退款金额', render: 'refundAmount', className: 'text-right', width: 180 }, { title: '退款金额', render: 'refundAmount', className: 'text-right', width: 180 },
{ title: '退款时间', index: 'applyTime', width: 170 }, { title: '退款时间', index: 'refundExecuteTime', width: 170 },
{ title: '货主', index: 'shipperId', width: 150 }, { title: '货主', index: 'shipperId', width: 150 },
{ title: '所属项目', index: 'enterpriseProjectName', width: 140 }, { title: '所属项目', index: 'enterpriseProjectName', width: 140 },
{ title: '支付单', render: 'billRefundPaymentVOS', width: 150 }, { title: '支付单', render: 'billRefundPaymentVOS', width: 150 },

2
src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts
View File

@ -115,7 +115,7 @@ export class CancellationInvoiceComponent implements OnInit {
*/ */
batchPush() { batchPush() {
if (this.selectedRows?.length <= 0) { if (this.selectedRows?.length <= 0) {
this.service.msgSrv.warning('请选择开票申请'); this.service.msgSrv.warning('请选择推送开票单');
return; return;
} }
if (this.selectedRows.find(item => item.sts !== '1')) { if (this.selectedRows.find(item => item.sts !== '1')) {

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

@ -87,7 +87,7 @@
</nz-card> </nz-card>
<nz-card class="content-box" nzBordered> <nz-card class="content-box" nzBordered>
<div class="d-flex align-items-center mb-md mt-sm"> <div class="d-flex align-items-center mb-md mt-sm" *ngIf="sts==='1'">
<button nz-button (click)="openRequestedModal('1')">全部开票</button> <button nz-button (click)="openRequestedModal('1')">全部开票</button>
<button nz-button (click)="openRequestedModal('2')">开票</button> <button nz-button (click)="openRequestedModal('2')">开票</button>
<button nz-button (click)="removeOrder()">移除</button> <button nz-button (click)="removeOrder()">移除</button>

2
src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts
View File

@ -26,6 +26,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
_$expand = false; _$expand = false;
id = null; id = null;
sts = null;
headerInfo: any = {}; headerInfo: any = {};
constructor( constructor(
public service: TicketService, public service: TicketService,
@ -34,6 +35,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
private router: Router private router: Router
) { ) {
this.id = route.snapshot.params.id; this.id = route.snapshot.params.id;
this.sts = route.snapshot.queryParams.sts;
this.loadHeadInfo(); this.loadHeadInfo();
} }

2
src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts
View File

@ -420,7 +420,7 @@ export class InvoiceRequestedComponent implements OnInit {
// }, // },
{ {
text: '订单明细<br/>', text: '订单明细<br/>',
click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id]) click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.id], { queryParams: { sts: item.sts } })
}, },
{ {
text: '查看原因<br/>', text: '查看原因<br/>',