解决冲突

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

@@ -23,24 +23,16 @@ export class OrderManagementComplaintComponent implements OnInit {
   _$expand = false;
   channelId: any;
   resourceStatus: any;
+  selectedMainTabStatus = '1';
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   @ViewChild('sfView', { static: false }) sfView!: SFComponent;
   columns: STColumn[] = [];
-  datass: any = [
-    {
-    one: '1',
-    two: '1',
-    three: '1',
-    id: 1
-   },
-    {
-    one: '2',
-    two: '2',
-    three: '2',
-    id: 2
-   },
-];
+  selectedIndex: number = 0;
+  mainTabs = [
+    { name: '投诉', status: '1' },
+    { name: '被投诉', status: '2' },
+  ]
   tabs = [  {
     name: '全部',
     type: 0,
@@ -62,7 +54,11 @@ export class OrderManagementComplaintComponent implements OnInit {
     public service: OrderManagementService,
     private modal: NzModalService,
     private router: Router
-     ) { }
+     ) {     if (this.selectedIndex === 0) {
+      this.selectedMainTabStatus = '1';
+    } else if (this.selectedIndex === 1) {
+      this.selectedMainTabStatus = '2';
+    }}
 
   /**
  * 查询参数
@@ -72,6 +68,9 @@ export class OrderManagementComplaintComponent implements OnInit {
     if(this.resourceStatus) {
       a.complaintStatus = this.resourceStatus 
     }
+    if(this.selectedMainTabStatus) {
+      a.complaintType = this.selectedMainTabStatus
+    }
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
     return {
@@ -155,7 +154,14 @@ export class OrderManagementComplaintComponent implements OnInit {
         className: 'text-center',
         width: '120px',
         index: 'complaintStatusLabel'
-      }, {
+      },
+      {
+        title: '处理人',
+        className: 'text-center',
+        width: '200px',
+        index:'handlePartyLabel'
+      },
+      {
         title: '处理结果',
         className: 'text-center',
         width: '170px',
@@ -240,6 +246,19 @@ export class OrderManagementComplaintComponent implements OnInit {
       this.st.load();
     }, 500);
   }
+    /**
+   * 切换投诉与被投诉tab
+   */
+     selectMainTab(e: any) {
+      console.log(this.selectedIndex);
+      this.selectedMainTabStatus = e?.status;
+      this.initST();
+      this.initSF();
+      setTimeout(() => {
+        this.st.load(1);
+      })
+    }
+  
   /**
    * 导入货源
    */