fix bug

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-12 16:51:55
+ * @LastEditTime : 2022-05-12 17:15:50
  * @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-test.eascs.com',
+      host: 'tms-api-dev.eascs.com',
       protocol: 'https:',
       port: 443
     },

src/app/routes/partner/rebate-management/components/rebate-record/rebate-record.component.ts

@@ -68,7 +68,7 @@ export class ParterRebateManageMentRecordComponent implements OnInit {
       {
         title: '月份',
         index: 'month',
-        format: (item: any) => {return item?.month ? item?.month + '月' : ''}
+        format: (item: any) => {return ((item?.year ? item?.year + '-' : '') + (item?.month ? item.month  : ''))}
       },
       {
         title: '返佣金额（元）',

src/app/routes/partner/rebate-management/model/abnormal-feedback/abnormal-feedback.component.html

@@ -4,23 +4,22 @@
  * @Author       : Shiming
  * @Date         : 2022-02-24 20:09:49
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-03-10 15:10:47
+ * @LastEditTime : 2022-05-12 17:43:46
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.html
  * Copyright (C) 2022 huzhenhong. All rights reserved.
 -->
 <sv-container col="1">
-  <sv label="异常反馈">
+  <sv *ngFor="let item of mybidDetailInfo"  label="异常反馈" >
-    <div>有订单有异常请查看 </div>
+    <div>{{item.feedbackInfo}} </div>
-    <div>2022-09-08  00:00:00 </div>
+    <div>{{item.createTime}}  </div>
+    <sv label="回复" *ngIf="item.replyVOList">
+      <div>{{item.replyVOList}} </div>
+      <div>{{item.feedbackInfo}}  </div>
+    </sv>
+  </sv>
+  <sv *ngIf="mybidDetailInfo.length == 0"label="异常反馈" >
+    <div>暂无反馈信息 </div>
   </sv>
-  <!-- <sv label="异常反馈">
-    <p *ngFor="let data of i?.mybidDetailInfo; let index = index">
-      <label *ngIf="data?.paymentStatusLabel == '已支付'">
-        <span>{{data?.expenseName}}</span>
-        <span>{{ data.price | number: '0.2-2' }}</span>
-      </label>
-    </p>
-  </sv> -->
 </sv-container>
 <div>
   <sf

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-05-12 16:46:35
+ * @LastEditTime : 2022-05-12 17:41:17
  * @FilePath     : \\tms-obc-web\\src\\app\\routes\\partner\\rebate-management\\model\\abnormal-feedback\\abnormal-feedback.component.ts
  * Copyright (C) 2022 huzhenhong. All rights reserved.
  */
@@ -24,6 +24,7 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
   i!: any;
+  mybidDetailInfo: any = [];
   data = [{ name1: 1111 }];
   constructor(public service: RebateManagementService, public shipperservice: ShipperBaseService, public modalRef: NzModalRef) {}
 
@@ -35,15 +36,16 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
     if (this.i) {
       console.log(this.i);
       
-      this.service.request(this.service.$api_get_getExceptionMessage, { partnerId: this.i?.partnerId }).subscribe(res => {
+      this.service.request(this.service.$api_get_getExceptionMessage, { partnerId: this.i?.partnerId,month:  this.i.month,year:  this.i.year }).subscribe(res => {
         console.log(res);
+        this.mybidDetailInfo = res
       });
     }
   }
   initSF() {
     this.schema = {
       properties: {
-        name3: {
+        feedbackInfo: {
           type: 'string',
           title: '回复',
           maxLength: 50,
@@ -63,6 +65,14 @@ export class ParterRebateManageMenAbnormalFeedbackComponent implements OnInit {
     };
   }
   close() {
+    if(!this.sf.valid) {
+      this.service.msgSrv.error('请填写必填项！')
+      return
+    }
+    let params = {
+
+    }
+    this.service.request(this.service.$api_get_partnerIncomeExceptionAdd)
     this.modalRef.destroy();
   }
 }

src/app/routes/usercenter/components/freight/list/detail/detail.component.ts

@@ -505,9 +505,9 @@ export class FreightComponentsListDetailComponent implements OnInit, OnDestroy {
         if (res.name) {
           this.detailData.enterpriseName = res.name;
         }
-        if (res.type) {
+        // if (res.type) {
-          this.detailData.enterpriseType = res.type;
+        //   this.detailData.enterpriseType = res.type;
-        }
+        // }
         if (res.addressRegionCodes) {
           this.detailData.enterpriseAddressCode = res.addressRegionCodes;
         }