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

src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts

@@ -556,7 +556,7 @@ export class DatatableOrderReportingComponent implements OnInit {
       this.openWainingModal('请选择需要更新的数据');
       return;
     }
-    const ids = this.selectedRows.map(i => i?.id);
+    const ids = this.selectedRows.map(i => i?.orderId);
     this.service.request(this.service.$api_update_order_data, ids).subscribe(res => {
       if (res) {
         this.service.msgSrv.success('更新成功');

src/app/routes/datatable/reporting/components/verify-result/verify-result.component.ts

@@ -76,8 +76,8 @@ export class DatatableReportingVerifyResultComponent implements OnInit {
   }
 
   selectTab(e: any) {
+    this.subjectType = e?.value;
     setTimeout(() => {
-      this.subjectType = e?.value;
       this.st.load(1);
     })
   }