Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

This commit is contained in:
heqinghang
2022-03-30 10:45:37 +08:00
5 changed files with 11 additions and 9 deletions

View File

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

View File

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

View File

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

View File

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

View File

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