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

proxy.conf.js

@@ -4,7 +4,7 @@
  * @Author       : Shiming
  * @Date         : 2022-01-18 09:51:21
  * @LastEditors  : Shiming
- * @LastEditTime : 2022-05-06 15:29:21
+ * @LastEditTime : 2022-05-06 16:05:45
  * @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/partner-list/components/index/partner-list.component.ts

@@ -9,6 +9,7 @@ import { AddCollectionInvoiceModalComponent } from 'src/app/routes/ticket-manage
 
 import { PartnerListService } from '../../services/partner-list.service';
 import { PartnerAuditModalComponent } from '../partner-audit-modal/partner-audit-modal.component';
+import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'app-partner-list',
@@ -358,11 +359,22 @@ export class PartnerListComponent {
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            // async: 
+            asyncData: () =>
+            this.service.request(this.service.$api_get_rebate_config, {}, 'POST').pipe(
+              map(data => {
+               if(data) {
+                return data.map((m: any) => {
+                  return { label: m.configName, value: m.id };
+                });
+               } else {
+          return [];
+
+               }
+              })
+            ),
             visibleIf: {
               expand: (value: boolean) => value
-            }
+          } } as SFDateWidgetSchema
-          }
         },
         lockedStatus: {
           type: 'string',