From e5e622d30d3535df6addea8d824afcb83414e397 Mon Sep 17 00:00:00 2001
From: wangshiming <shimin.wang@eascs.com>
Date: Thu, 21 Apr 2022 10:09:42 +0800
Subject: [PATCH] fix bug

---
 .../freight-account-detail.component.ts       | 49 ++++++++++++-------
 .../components/freight/user/user.component.ts |  2 +
 .../usercenter/services/usercenter.service.ts |  2 +-
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
index 780578c2..f045fc46 100644
--- a/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
+++ b/src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts
@@ -153,34 +153,45 @@ export class FreightAccountDetailComponent implements OnInit {
             placeholder: '请输入'
           }
         },
+        // tradeType: {
+        //   type: 'string',
+        //   title: '交易类型',
+        //   enum: [
+        //     { label: '全部', value: '' },
+        //     { label: '整车订单退款', value: '1' },
+        //     { label: '整车订单支付', value: '2' },
+        //     { label: '提现失败退回', value: '3' },
+        //     { label: '提现', value: '4' },
+        //     { label: '充值', value: '5' },
+        //     { label: '运货订单结算F', value: '5' }
+        //   ],
+        //   ui: {
+        //     widget: 'select',
+        //     placeholder: '请选择',
+        //     visibleIf: {
+        //       expand: (value: boolean) => value
+        //     }
+        //   },
+        //   default: ''
+        // },
         tradeType: {
           type: 'string',
           title: '交易类型',
-          enum: [
-            { label: '全部', value: '' },
-            { label: '整车订单退款', value: '1' },
-            { label: '整车订单支付', value: '2' },
-            { label: '提现失败退回', value: '3' },
-            { label: '提现', value: '4' },
-            { label: '充值', value: '5' },
-            { label: '运货订单结算F', value: '5' }
-          ],
           ui: {
-            widget: 'select',
-            placeholder: '请选择',
+            widget: 'dict-select',
+            params: { dictKey: 'trade:type' },
             visibleIf: {
               expand: (value: boolean) => value
-            }
-          },
-          default: ''
+            },
+          } as SFSelectWidgetSchema
         },
         incomeType: {
           type: 'string',
           title: '收支类型',
           enum: [
             { label: '全部', value: '' },
-            { label: '收入', value: '1' },
-            { label: '支出', value: '2' }
+            { label: '收入', value: '2' },
+            { label: '支出', value: '1' }
           ],
           ui: {
             widget: 'select',
@@ -191,16 +202,16 @@ export class FreightAccountDetailComponent implements OnInit {
           },
           default: ''
         },
-        projectId: {
+        projectName: {
           type: 'string',
           title: '所属项目',
           ui: {
             placeholder: '请输入',
             visibleIf: {
               expand: (value: boolean) => value
-            },
+            }
           }
-        },
+        }
         // projectId: {
         //   title: '所属项目',
         //   type: 'string',
diff --git a/src/app/routes/usercenter/components/freight/user/user.component.ts b/src/app/routes/usercenter/components/freight/user/user.component.ts
index 73b44001..8aee6208 100644
--- a/src/app/routes/usercenter/components/freight/user/user.component.ts
+++ b/src/app/routes/usercenter/components/freight/user/user.component.ts
@@ -197,6 +197,8 @@ export class FreightComponentsUserComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
+      { title: '企业名称', className: 'text-center', index: 'enterpriseName' },
+      { title: '项目名称', className: 'text-center', index: 'projectName' },
       { title: '用户姓名', className: 'text-center', index: 'name' },
       { title: '手机号', className: 'text-center', index: 'telephone' },
       { title: '身份证件号', className: 'text-center', index: 'certificateNumber' },
diff --git a/src/app/routes/usercenter/services/usercenter.service.ts b/src/app/routes/usercenter/services/usercenter.service.ts
index db00ea06..9b9c5d9f 100644
--- a/src/app/routes/usercenter/services/usercenter.service.ts
+++ b/src/app/routes/usercenter/services/usercenter.service.ts
@@ -48,7 +48,7 @@ export class UsermanageService extends ShipperBaseService {
   $api_update_enter_newowork_batch = '/api/mdc/cuc/enterpriseInfo/operate/updatnNetworkTransporter';
 
   // 货主员工列表(运营后台)
-  $api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserList';
+  $api_get_user_list = '/api/mdc/cuc/userApp/getShipperUserInfoList';
   // 冻结或恢复员工
   $api_lock_staff = '/api/mdc/cuc/userApp/freezeOrResumeStaff';
   // 冻结或恢复应用用户