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-03-25 17:24:26 +08:00
parent 27df213f2b 9020192e82
commit 7d54cf22ea
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -491,20 +491,21 @@ export class OrderManagementComplianceAuditComponent implements OnInit {
} }
// 申诉记录 // 申诉记录
appeal(item: any) { appeal(item: any) {
const modalRef = this.modal.create({ // const modalRef = this.modal.create({
nzTitle: '申诉', // nzTitle: '申诉',
nzContent: OneCarOrderAppealComponent, // nzContent: OneCarOrderAppealComponent,
nzComponentParams: { // nzComponentParams: {
i: item // i: item
}, // },
nzFooter: null // nzFooter: null
}); // });
modalRef.afterClose.subscribe((res) => { // modalRef.afterClose.subscribe((res) => {
if(res){ // if(res){
this.resetSF; // this.resetSF;
this.st.load(); // this.st.load();
} // }
}); // });
this.router.navigate(['/order-management/risk-detail', item.id]);
} }
/** /**
* 浮动费用查看 * 浮动费用查看

4
src/app/routes/supply-management/components/bulk/bulk.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-04 15:45:58 * @LastEditTime : 2022-03-25 16:51:13
* @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\components\\bulk\\bulk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -86,7 +86,7 @@
<ng-template st-row="resourceCode" let-item let-index="index"> <ng-template st-row="resourceCode" let-item let-index="index">
<a [routerLink]="'bulk-detail/' + item?.id">{{ item?.resourceCode }}</a> <a [routerLink]="'bulk-detail/' + item?.id">{{ item?.resourceCode }}</a>
<div>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</div> <div>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</div>
<div>{{ item?.resourceStatusLabel }}</div> <div>{{ item?.resourceStatusLabel === '已完成' ? '已完结' : item?.resourceStatusLabel }}</div>
</ng-template> </ng-template>
<!-- 服务类型 --> <!-- 服务类型 -->
<ng-template st-row="serviceType" let-item let-index="index"> <ng-template st-row="serviceType" let-item let-index="index">