From 230bcce9f3a0437f59999f39b1994c8ac062efb1 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 12 May 2022 16:53:50 +0800
Subject: [PATCH] fix bug

---
 proxy.conf.js                                 |  4 +-
 .../rebate-record.component.html              |  4 +-
 .../rebate-record/rebate-record.component.ts  |  2 +-
 .../abnormal-feedback.component.ts            | 13 +++-
 .../record-detail.component.html              |  2 +-
 .../record-detail/record-detail.component.ts  | 59 ++++++++++---------
 6 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/proxy.conf.js b/proxy.conf.js
index b9211e38..83d7ec32 100644
--- a/proxy.conf.js
+++ b/proxy.conf.js
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-11 19:19:55
+ * @LastEditTime : 2022-05-12 16:51:55
  * @FilePath     : \\tms-obc-web\\proxy.conf.js
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -30,7 +30,7 @@ module.exports = {
   // },
   '//api': {
     target: {
-      host: 'tms-api-dev.eascs.com',
+      host: 'tms-api-test.eascs.com',
       protocol: 'https:',
       port: 443
     },
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
index 46fa0a43..5e27e01e 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.html
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-12 15:42:27
+ * @LastEditTime : 2022-05-12 16:43:10
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\components\\rebate-record\\rebate-record.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
@@ -42,7 +42,7 @@
     [loading]="service.http.loading"
   >
   <ng-template st-row='abnormalFeedback' let-item let-index='index'>
-    <div style="color: #f59a23;" (click)="feedback()">123212{{item?.abnormalFeedback}}</div>
+    <div style="color: #f59a23;" (click)="feedback(item)">123212{{item?.abnormalFeedback}}</div>
   </ng-template>
   <ng-template st-row='profitAmountSum' let-item let-index='index'>
     <div >{{item?.profitAmountSum | currency}}</div>
diff --git a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
index dfc949a3..1cff3f6c 100644
--- a/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
+++ b/src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts
@@ -118,7 +118,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
       nzTitle: '明细',
       nzWidth: 1200,
       nzContent: ParterRebateManageMenRecordDetailComponent,
-      nzComponentParams: { },
+      nzComponentParams: { record: item },
       nzFooter: null
     });
     modal.afterClose.subscribe((res: any) => {
diff --git a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts
index 4c4f36d9..b4abc7cf 100644
--- a/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts
+++ b/src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.ts
@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-03-10 14:50:45
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 15:09:51
+ * @LastEditTime : 2022-05-12 16:46:35
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -29,8 +29,17 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
 
   ngOnInit() {
     this.initSF();
+    this.initData();
+  }
+  initData() {
+    if (this.i) {
+      console.log(this.i);
+      
+      this.service.request(this.service.$api_get_getExceptionMessage, { partnerId: this.i?.partnerId }).subscribe(res => {
+        console.log(res);
+      });
+    }
   }
-
   initSF() {
     this.schema = {
       properties: {
diff --git a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
index 63f8290c..69b77791 100644
--- a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
+++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.html
@@ -23,7 +23,7 @@
   <st
     #st
     [bordered]="true"
-    [data]="service.$api_get_listCompliancePage"
+    [data]="service.$api_get_partnerIncomeDetail"
     [columns]="columns"
     [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
     [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
diff --git a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
index 2af7dbcf..22c5d843 100644
--- a/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
+++ b/src/app/routes/partner/rebate-management/model/record-detail/record-detail.component.ts
@@ -21,6 +21,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
   spuStatus = '1';
   size: NzButtonSize = 'large';
   _$expand = false;
+  record: any;
   data = [{ name1: 1111 }];
   constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {}
   /**
@@ -43,10 +44,13 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
     const params: any = Object.assign({}, this.sf?.value || {});
     delete params._$expand;
     return {
+      partnerId: this.record.partnerId,
       ...params
     };
   }
   ngOnInit() {
+    console.log(this.record);
+
     this.initSF();
     this.initST();
   }
@@ -54,7 +58,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
   initSF() {
     this.schema = {
       properties: {
-        enterpriseInfoId: {
+        ltdId: {
           type: 'string',
           title: '网络货运人',
           ui: {
@@ -68,18 +72,27 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
             }
           }
         },
-        paymentStatus: {
+        bankType: {
           title: '银行类型',
           type: 'string',
-          ui: {
-            widget: 'dict-select',
-            params: { dictKey: 'overall:payment:status' },
-            containsAllLabel: true,
-            change: (value: any) => {
-              console.log(value);
-              this.st.reload();
+          enum: [
+            {
+              label: '全部',
+              value: ''
+            },
+            {
+              label: '平安银行',
+              value: '1'
+            },
+            {
+              label: '浦发银行',
+              value: '2'
             }
-          } as SFSelectWidgetSchema
+          ],
+          ui: {
+            widget: 'select',
+            containsAllLabel: true
+          }
         }
       }
     };
@@ -93,6 +106,10 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
 
   initST() {
     this.columns = [
+      {
+        title: '网络货运人',
+        index: 'billCode'
+      },
       {
         title: '订单号',
         index: 'billCode'
@@ -106,7 +123,7 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
         index: 'name1'
       },
       {
-        title: '预估返佣金额（元）',
+        title: '返佣金额（元）',
         index: 'name1'
       },
       {
@@ -118,27 +135,11 @@ export class ParterRebateManageMenRecordDetailComponent implements OnInit {
         index: 'name1'
       },
       {
-        title: '网络货运人',
+        title: '银行类型',
         index: 'name1'
       },
       {
-        title: '销售渠道',
-        index: 'name1'
-      },
-      {
-        title: '合伙人名称',
-        index: 'name1'
-      },
-      {
-        title: '合伙人等级',
-        index: 'name1'
-      },
-      {
-        title: '管理费比例',
-        index: 'name1'
-      },
-      {
-        title: '固定结算费率',
+        title: '虚拟账户',
         index: 'name1'
       },
       {