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:
潘晓云
2022-03-30 14:00:48 +08:00
parent a92b3bade0 866273b11c
commit 16c86c21a9
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-12 10:52:50 * @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-03-29 16:13:40 * @LastEditTime : 2022-03-30 13:44:53
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -54,6 +54,10 @@
<ng-template st-row="complaintCode" let-item let-index="index"> <ng-template st-row="complaintCode" let-item let-index="index">
<a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a> <a href="javascript:;" (click)="view(item)">{{item.complaintCode}}</a>
</ng-template> </ng-template>
<ng-template st-row="complaintCauseLabel" let-item let-index="index">
<div *ngIf="selectedMainTabStatus == '2'">{{item?.drvComplaintCauseLabel}}</div>
<div *ngIf="selectedMainTabStatus == '1'">{{item?.complaintCauseLabel}}</div>
</ng-template>
</st> </st>
</div> </div>
</nz-card> </nz-card>

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

@ -23,15 +23,15 @@ export class OrderManagementComplaintComponent implements OnInit {
_$expand = false; _$expand = false;
channelId: any; channelId: any;
resourceStatus: any; resourceStatus: any;
selectedMainTabStatus = '1'; selectedMainTabStatus = '2';
@ViewChild('st') private readonly st!: STComponent; @ViewChild('st') private readonly st!: STComponent;
@ViewChild('sf', { static: false }) sf!: SFComponent; @ViewChild('sf', { static: false }) sf!: SFComponent;
@ViewChild('sfView', { static: false }) sfView!: SFComponent; @ViewChild('sfView', { static: false }) sfView!: SFComponent;
columns: STColumn[] = []; columns: STColumn[] = [];
selectedIndex: number = 0; selectedIndex: number = 0;
mainTabs = [ mainTabs = [
{ name: '司机投诉', status: '1' }, { name: '司机投诉', status: '2' },
{ name: '货主投诉', status: '2' }, { name: '货主投诉', status: '1' },
] ]
tabs = [ { tabs = [ {
name: '全部', name: '全部',
@ -71,17 +71,8 @@ export class OrderManagementComplaintComponent implements OnInit {
if(this.resourceStatus) { if(this.resourceStatus) {
a.complaintStatus = this.resourceStatus a.complaintStatus = this.resourceStatus
} }
console.log(this.selectedMainTabStatus);
if(this.selectedMainTabStatus) { if(this.selectedMainTabStatus) {
switch(this.selectedMainTabStatus) { a.complainantParty = this.selectedMainTabStatus
case '1':
a.complainantParty = '2'
break;
case '2':
a.complainantParty = '1'
break;
}
} }
const params: any = Object.assign({}, this.sf?.value || {}); const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand; delete params._$expand;
@ -166,7 +157,7 @@ export class OrderManagementComplaintComponent implements OnInit {
title: '投诉原因', title: '投诉原因',
className: 'text-center', className: 'text-center',
width: '170px', width: '170px',
index: 'complaintCauseLabel' render: 'complaintCauseLabel'
}, },
{ {
title: '投诉状态', title: '投诉状态',