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:
heqinghang
2022-03-30 10:45:37 +08:00
parent 31923bec62 dafe2a811f
commit b585793c46
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-03-29 14:30:12
* @LastEditTime : 2022-03-30 09:35:49
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -222,7 +222,7 @@
</ng-template>
</div>
</nz-card>
<nz-card *ngIf="!route?.snapshot?.queryParams?.sts">
<nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
<nz-tabset >
<nz-tab nzTitle="风险异常检测">
<button nz-button nzType="primary"[disabled]="">申 诉</button>

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

@ -55,9 +55,9 @@ export class OrderManagementComplaintComponent implements OnInit {
private modal: NzModalService,
private router: Router
) { if (this.selectedIndex === 0) {
this.selectedMainTabStatus = '1';
} else if (this.selectedIndex === 1) {
this.selectedMainTabStatus = '2';
} else if (this.selectedIndex === 1) {
this.selectedMainTabStatus = '1';
}}
/**
@ -69,7 +69,7 @@ export class OrderManagementComplaintComponent implements OnInit {
a.complaintStatus = this.resourceStatus
}
if(this.selectedMainTabStatus) {
a.complaintType = this.selectedMainTabStatus
a.complainantParty = this.selectedMainTabStatus
}
console.log( this.sf?.value);

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
* @LastEditTime : 2022-03-28 20:31:30
* @LastEditTime : 2022-03-30 09:36:23
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
@ -229,7 +229,7 @@
</ng-template>
</div>
</nz-card>
<nz-card *ngIf="!route?.snapshot?.queryParams?.sts">
<nz-card *ngIf="!route?.snapshot?.queryParams?.sts && abnormalList.length > 0">
<nz-tabset >
<nz-tab nzTitle="风险异常检测">
<button nz-button nzType="primary"[disabled]="">申 诉</button>

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

@ -65,7 +65,7 @@
<p style="margin: 0;">开户行： {{openInfo?.artobank}}</p>
</se>
<se [col]="1" label="服务名称" class="mb-sm">
{{openInfo?.vatnameLable}}
{{openInfo?.vatnameLabel}}
</se>
<se [col]="1" label="发票备注栏" class="mb-sm">
{{openInfo?.vatremarks}}

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

@ -50,6 +50,8 @@ export class InvoiceRequestedDetailComponent implements OnInit {
}
beforeReq = (requestOptions: STRequestOptions) => {
this.totalCallNo = '0';
this.selectedRows = [];
Object.assign(requestOptions.body, { vatappHId: this.id });
if (this.sf) {
Object.assign(requestOptions.body, { ...this.sf.value });
@ -58,7 +60,7 @@ export class InvoiceRequestedDetailComponent implements OnInit {
};
afterRes = (data: any[], rawData?: any) => {
this.totalCallNo = data.reduce((total, cv) => total + cv.billkpmoney, 0).toFixed(2);
// this.totalCallNo = data.reduce((total, cv) => total + cv.billkpmoney, 0).toFixed(2);
return data.map(item => ({
...item
}));