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

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

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

src/app/routes/supply-management/components/bulk/bulk.component.html

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-12 10:52:50
  * @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
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -86,7 +86,7 @@
       <ng-template st-row="resourceCode" let-item let-index="index">
         <a [routerLink]="'bulk-detail/' + item?.id">{{ item?.resourceCode }}</a>
         <div>{{ item?.resourceTypeLabel }}{{ item?.serviceTypeLabel }}</div>
-        <div>{{ item?.resourceStatusLabel }}</div>
+        <div>{{ item?.resourceStatusLabel === '已完成' ? '已完结' : item?.resourceStatusLabel }}</div>
       </ng-template>
       <!-- 服务类型 -->
       <ng-template st-row="serviceType" let-item let-index="index">