edit

package.json

@@ -11,7 +11,7 @@
   "scripts": {
     "ng-high-memory": "node --max_old_space_size=8000 ./node_modules/@angular/cli/bin/ng",
     "ng": "ng",
-    "start": "ng s -o --port 4202",
+    "start": "ng s -o --port 4202  --host 0.0.0.0",
     "hmr": "ng s -o --hmr",
     "build": "npm run ng-high-memory build --",
     "build:dev": "npm run build -- -c dev",

src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.html

@@ -30,7 +30,7 @@
         <nz-tab nzTitle="全部"></nz-tab>
     </nz-tabset>
 
-    <st #st [data]="service.$mock_url" [columns]="columns"
+    <st #st [data]="service.$api_get_abnormal_gold_page" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' },  process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"

src/app/routes/financial-management/components/abnormal-gold/abnormal-gold.component.ts

@@ -76,30 +76,38 @@ export class AbnormalGoldComponent implements OnInit {
             hidden: true
           }
         },
-        orderSn: {
+        paySerialNumber: {
           type: 'string',
           title: '银行流水号',
           ui: {
             placeholder: '请输入'
           }
         },
-        receiveName: {
+        ltdid: {
           type: 'string',
           title: '网络货运人',
-          enum: [{ label: '全部', value: '全部' }],
           ui: {
             widget: 'select',
-            placeholder: '请选择'
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarder()
           }
         },
-        orderSn22: {
+        bankType: {
           type: 'string',
           title: '银行类型',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '平安银行', value: '1' },
+            { label: '浦发银行', value: '2' }
+          ],
           ui: {
-            placeholder: '请输入'
+            widget: 'select',
-          }
+            placeholder: '请选择',
           },
-        orderSn2: {
+          default: ''
+        },
+        transferBankAccount: {
           type: 'string',
           title: '付款账户',
           ui: {
@@ -109,7 +117,7 @@ export class AbnormalGoldComponent implements OnInit {
             }
           }
         },
-        orderSn221: {
+        transferBankCardNumber: {
           type: 'string',
           title: '付款账号',
           ui: {
@@ -119,7 +127,7 @@ export class AbnormalGoldComponent implements OnInit {
             }
           }
         },
-        orderS2n221: {
+        transferBankOpenName: {
           type: 'string',
           title: '付款银行',
           ui: {
@@ -129,13 +137,14 @@ export class AbnormalGoldComponent implements OnInit {
             }
           }
         },
-        createTime: {
+        transferDate: {
           title: '转账时间',
           type: 'string',
           ui: {
-            widget: 'date',
+            widget: 'sl-from-to-search',
-            mode: 'range',
             format: 'yyyy-MM-dd',
+            placeholder: '请选择',
+            nzShowTime: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -147,17 +156,17 @@ export class AbnormalGoldComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '银行流水号', index: 'no', width: 150 },
+      { title: '银行流水号', index: 'paySerialNumber', width: 150 },
-      { title: '网络货运人', index: 'callNo', width: 120 },
+      { title: '网络货运人', index: 'ltdid', width: 120 },
-      { title: '银行类型', index: 'callNo', width: 100 },
+      { title: '银行类型', index: 'callNo', width: 100, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
       { title: '资金总账号', index: 'callNo', width: 120 },
-      { title: '充值金额', index: 'callNo', width: 100 },
+      { title: '充值金额', index: 'rechargeAmount', width: 100 },
-      { title: '付款账户', index: 'callNo', width: 100 },
+      { title: '付款账户', index: 'transferBankAccount', width: 100 },
-      { title: '付款账号', index: 'callNo', width: 100 },
+      { title: '付款账号', index: 'transferBankCardNumber', width: 100 },
-      { title: '付款银行', index: 'callNo', width: 100 },
+      { title: '付款银行', index: 'transferBankOpenName', width: 100 },
-      { title: '转账时间', index: 'callNo', type: 'date', width: 150 },
+      { title: '转账时间', index: 'transferDate', type: 'date', width: 150 },
-      { title: '转账备注', index: 'callNo', width: 100 },
+      { title: '转账备注', index: 'rechargeRemark', width: 100 },
-      { title: '操作人', index: 'callNo', width: 90 },
+      { title: '操作人', index: 'rechargeName', width: 90 },
       { title: '操作时间', index: 'callNo', type: 'date', width: 150 },
       { title: '状态', index: 'callNo', width: 90 },
       {

src/app/routes/financial-management/components/driver-account/driver-account-detail/driver-account-detail.component.html

@@ -53,7 +53,7 @@
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-    <st #st [data]="service.$api_get_shipper_or_driver_account_detail" [columns]="columns"
+    <st #st [data]="service.$api_get_driver_account_detail" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.html

@@ -52,7 +52,7 @@
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-    <st #st [data]="service.$api_get_shipper_or_driver_account_detail" [columns]="columns"
+    <st #st [data]="service.$api_get_shipper_account_detail" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' },  process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"

src/app/routes/financial-management/components/freight-account/freight-account-detail/freight-account-detail.component.ts

@@ -38,7 +38,13 @@ export class FreightAccountDetailComponent implements OnInit {
       roleId: this.params.roleId
     });
     if (this.sf) {
-      Object.assign(requestOptions.body, { ...this.sf.value });
+      Object.assign(requestOptions.body, {
+        ...this.sf.value,
+        createTime: {
+          start: this.sf?.value.createTime?.[0] || null,
+          end: this.sf?.value.createTime?.[1] || null
+        }
+      });
     }
     return requestOptions;
   };
@@ -46,7 +52,7 @@ export class FreightAccountDetailComponent implements OnInit {
   loadInfo() {
     this.service
       .request(this.service.$api_get_shipper_account_balance_detail, {
-        ...this.sf.value,
+        ...this.sf?.value,
         ltdid: this.params.ltdid,
         projectId: this.params.projectId,
         enterpriseId: this.params.enterpriseId,
@@ -54,8 +60,8 @@ export class FreightAccountDetailComponent implements OnInit {
         pageIndex: this.st.pi,
         pageSize: this.st.ps,
         createTime: {
-          start: this.sf.value.createTime?.[0] || null,
+          start: this.sf?.value.createTime?.[0] || null,
-          end: this.sf.value.createTime?.[1] || null
+          end: this.sf?.value.createTime?.[1] || null
         }
       })
       .subscribe(res => {

src/app/routes/financial-management/components/freight-account/freight-account.component.ts

@@ -147,15 +147,15 @@ export class FreightAccountComponent implements OnInit {
       { title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
       { title: '虚拟账户', index: 'virtualAccount' },
       { title: '可用余额', index: 'availableBalance' },
-      { title: '冻结余额', index: 'availableBalance' },
+      { title: '冻结余额', index: 'freezeBalance' },
       { title: '累计消费金额', index: 'description' },
-      { title: '账户总余额', render: 'availableBalance' },
+      { title: '账户总余额', render: 'description' },
       { title: '创建时间', index: 'createTime', type: 'date', width: 150 },
       {
         title: '状态',
-        render: 'stateLocked',
+        index: 'stateDeleted',
         type: 'badge',
-        badge: { 0: { text: '正常', color: 'success' }, 1: { text: '锁定', color: 'warning' } }
+        badge: { 0: { text: '正常', color: 'success' }, 1: { text: '停用', color: 'warning' } }
       },
       {
         title: '操作',

src/app/routes/financial-management/components/payment-record/payment-record.component.html

@@ -24,15 +24,34 @@
 <nz-card class="content-box" nzBordered>
 
     <nz-tabset>
-        <nz-tab nzTitle="全部"></nz-tab>
+        <nz-tab nzTitle="全部"  (nzClick)="changePaymentStatus()"></nz-tab>
-        <nz-tab nzTitle="支付中"></nz-tab>
+        <nz-tab nzTitle="支付中" (nzClick)="changePaymentStatus('3')"></nz-tab>
-        <nz-tab nzTitle="已支付"></nz-tab>
+        <nz-tab nzTitle="已支付" (nzClick)="changePaymentStatus('1')"></nz-tab>
-        <nz-tab nzTitle="支付失败"></nz-tab>
+        <nz-tab nzTitle="支付失败" (nzClick)="changePaymentStatus('4')"></nz-tab>
     </nz-tabset>
 
-    <st #st [data]="service.$mock_url" [columns]="columns"
+    <st #st [data]="service.$api_get_order_payment_page" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }"></st>
+        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }">
+        <ng-template st-row="orderPaymentCode" let-item let-index="index" let-column="column">
+            {{ item.orderPaymentCode }} <br> <a>{{ paymentStatusEm[item.paymentStatus] }}</a>
+        </ng-template>
+        <ng-template st-row="amountDetails" let-item let-index="index" let-column="column">
+            预付:￥{{ item.price }}<br />附加费:￥ {{ item.surcharge }}
+        </ng-template>
+        <ng-template st-row="billCode" let-item let-index="index" let-column="column">
+            {{ item.billCode }} <br> {{billStatus[item.billStatus] }}
+        </ng-template>
+        <ng-template st-row="wayBillCode" let-item let-index="index" let-column="column">
+            {{ item.wayBillCode }} <br> {{wayBillStatus[item.wayBillStatus ] }}
+        </ng-template>
+        <ng-template st-row="driverId" let-item let-index="index" let-column="column">
+            {{ item.driverName }} <br> {{ item.driverTelephone }} <br> {{ item.driverLicensePlate }}
+        </ng-template>
+        <ng-template st-row="captainName" let-item let-index="index" let-column="column">
+            {{ item.captainName }} <br> {{ item.captainTelephone }}
+        </ng-template>
+    </st>
 </nz-card>

src/app/routes/financial-management/components/payment-record/payment-record.component.ts

@@ -19,20 +19,61 @@ export class PaymentRecordComponent implements OnInit {
   columns: STColumn[] = this.initST();
   searchSchema: SFSchema = this.initSF();
 
-
   _$expand = false;
 
+  paymentStatus: any = '';
+
+  paymentStatusEm: any = {
+    0: '待支付',
+    1: '已支付',
+    2: '已拒绝',
+    3: '支付中',
+    4: '支付失败'
+  };
+  billStatus: any = {
+    1: '待接单',
+    2: '待发车',
+    3: '运输中',
+    4: '待签收',
+    5: '已完成',
+    6: '已取消'
+  };
+  wayBillStatus: any = {
+    1: '待接单',
+    2: '待发车',
+    3: '运输中',
+    4: '待签收',
+    5: '已完成',
+    6: '已取消'
+  };
+
   constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
 
   ngOnInit(): void {}
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
-      Object.assign(requestOptions.body, { ...this.sf.value });
+      Object.assign(requestOptions.body, {
+        ...this.sf.value,
+        applyDate: {
+          start: this.sf.value.applyDate?.[0] || null,
+          end: this.sf.value.applyDate?.[1] || null
+        },
+        handlerDate: {
+          start: this.sf.value.handlerDate?.[0] || null,
+          end: this.sf.value.handlerDate?.[1] || null
+        },
+        paymentStatus: this.paymentStatus || ''
+      });
     }
     return requestOptions;
   };
 
+  changePaymentStatus(status?: string) {
+    this.paymentStatus = status || null;
+    this.st.load(1);
+  }
+
   refund(item: any) {
     this.nzModalService.warning({
       nzTitle: '确定要关闭所选支付记录？',
@@ -72,33 +113,34 @@ export class PaymentRecordComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        order2Sn: {
+        billCode: {
           type: 'string',
           title: '订单号',
           ui: {
             placeholder: '请输入'
           }
         },
-        orderSn22: {
+        resourceCode: {
           type: 'string',
           title: '货源编号',
           ui: {
             placeholder: '请输入'
           }
         },
-        orderSn2: {
+        serviceType: {
           type: 'string',
           title: '服务类型',
-          enum: [{ label: '全部', value: '全部' }],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'service:type' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
           },
-        orderSn221: {
+          default: ''
+        },
+        driver: {
           type: 'string',
           title: '承运司机',
           ui: {
@@ -108,7 +150,7 @@ export class PaymentRecordComponent implements OnInit {
             }
           }
         },
-        orderS2n221: {
+        driverLicensePlate: {
           type: 'string',
           title: '车牌号',
           ui: {
@@ -118,7 +160,7 @@ export class PaymentRecordComponent implements OnInit {
             }
           }
         },
-        orderS2n2221: {
+        captain: {
           type: 'string',
           title: '收款人',
           ui: {
@@ -128,73 +170,87 @@ export class PaymentRecordComponent implements OnInit {
             }
           }
         },
-        orderSn221f: {
+        isCaptain: {
           type: 'string',
           title: '车队长收款',
-          enum: [{ label: '全部', value: '全部' }],
+          enum: [
+            { label: '全部', value: '' },
+            { label: '否', value: 0 },
+            { label: '是', value: 1 }
+          ],
           ui: {
             widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
           },
-        ord1erSn221f: {
+          default: ''
+        },
+        payType: {
           type: 'string',
           title: '支付类型',
-          enum: [{ label: '全部', value: '全部' }],
+          enum: [{ label: '全部', value: '' }],
           ui: {
             widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
           },
-        createTime: {
+          default: ''
+        },
+        applyDate: {
           title: '申请时间',
           type: 'string',
           ui: {
-            widget: 'date',
+            widget: 'sl-from-to-search',
-            mode: 'range',
             format: 'yyyy-MM-dd',
+            placeholder: '请选择',
+            nzShowTime: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
           } as SFDateWidgetSchema
         },
-        create1Time: {
+        handlerDate: {
           title: '处理时间',
           type: 'string',
           ui: {
-            widget: 'date',
+            widget: 'sl-from-to-search',
-            mode: 'range',
             format: 'yyyy-MM-dd',
+            placeholder: '请选择',
+            nzShowTime: true,
             visibleIf: {
               expand: (value: boolean) => value
             }
           } as SFDateWidgetSchema
         },
-        orderSn5221f: {
+        bankType: {
           type: 'string',
           title: '银行类型',
-          enum: [{ label: '全部', value: '全部' }],
+          enum: [
+            { label: '全部', value: '' },
+            { label: '平安银行', value: '1' },
+            { label: '浦发银行', value: '2' }
+          ],
           ui: {
             widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
           },
-        orde1rSn5221f: {
+          default: ''
+        },
+        ltdid: {
           type: 'string',
           title: '网络货运人',
-          enum: [{ label: '全部', value: '全部' }],
           ui: {
             widget: 'select',
             placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarder(),
             visibleIf: {
               expand: (value: boolean) => value
             }
@@ -206,24 +262,49 @@ export class PaymentRecordComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '支付编号', index: 'no', width: 150, format: item => `JS20210930000001</br><label class="text-orange">支付中</label>` },
+      { title: '支付编号', render: 'orderPaymentCode', width: 150 },
-      { title: '支付金额', index: 'callNo', width: 100, format: item => `￥2000.00` },
+      { title: '支付金额', render: 'payAmount', width: 100, format: item => `￥${item.payAmount}` },
-      { title: '运费明细', index: 'callNo', width: 150, format: item => `预付:￥ 4000.00</br>附加费:￥ 200.00` },
+      {
-      { title: '支付类型', index: 'callNo', width: 100 },
+        title: '运费明细',
-      { title: '货主', index: 'callNo', width: 100 },
+        render: 'amountDetails',
-      { title: '订单号', index: 'callNo', width: 100, format: item => `DZ210817466436972</br><label class="text-orange">待签收</label>` },
+        width: 150,
-      { title: '运单号', index: 'callNo', width: 100, format: item => `DZ210817466436972</br><label class="text-orange">待签收</label>` },
+        format: item => {
-      { title: '货源编号', index: 'callNo', width: 100 },
+          let surcharge = 0;
-      { title: '服务类型', index: 'callNo', type: 'date', width: 150 },
+          (item.amountDetails as Array<any>).forEach(detail => {
-      { title: '承运司机', index: 'callNo', width: 120, format: item => `特朗普</br>13789040523</br>粤GT8419` },
+            surcharge += detail.surcharge || 0;
-      { title: '收款人', index: 'callNo', width: 120, format: item => `拜登</br>13789040523` },
+          });
-      { title: '银行类型', index: 'callNo', type: 'date', width: 150 },
+          item.surcharge = surcharge;
-      { title: '网络货运人', index: 'callNo', width: 120 },
+          item.price = item.amountDetails?.[0]?.price || 0;
-      { title: '申请时间', index: 'callNo', width: 150 },
+          return '';
-      { title: '申请人', index: 'callNo', width: 90 },
+        }
-      { title: '处理时间', index: 'callNo', width: 150 },
+      },
-      { title: '处理人', index: 'callNo', width: 90 },
+      {
-      { title: '失败原因', index: 'callNo', width: 100 },
+        title: '支付类型',
+        index: 'payType',
+        width: 130,
+        type: 'enum',
+        enum: { 1: '货主支付平台', 2: '平台支付司机', 3: '司机支付车队长' }
+      },
+      { title: '货主', index: 'enterpriseInfoName', width: 100 },
+      { title: '订单号', render: 'billCode', width: 120 },
+      { title: '运单号', render: 'wayBillCode', width: 120 },
+      { title: '货源编号', index: 'resourceCode', width: 120 },
+      {
+        title: '服务类型',
+        index: 'serviceType',
+        width: 150,
+        type: 'enum',
+        enum: { '1': '抢单', '2': '指派', '3': '二维码', '4': '手工单' }
+      },
+      { title: '承运司机', render: 'driverId', width: 120 },
+      { title: '收款人', render: 'captainName', width: 120 },
+      { title: '银行类型', index: 'bankType', width: 150, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
+      { title: '网络货运人', index: 'ltdname', width: 120 },
+      { title: '申请时间', index: 'applyTime', width: 160 },
+      { title: '申请人', index: 'applyUsername', width: 90 },
+      { title: '处理时间', index: 'handleTime', width: 150 },
+      { title: '处理人', index: 'handlerUsername', width: 90 },
+      { title: '失败原因', index: 'failCause', width: 100 },
       {
         title: '操作',
         fixed: 'right',
@@ -232,6 +313,7 @@ export class PaymentRecordComponent implements OnInit {
         buttons: [
           {
             text: '关闭',
+            iif: item => item.paymentStatus === 4,
             click: item => this.refund(item)
           }
         ]

src/app/routes/financial-management/components/recharge-record/recharge-record.component.html

@@ -36,9 +36,13 @@
 </nz-card>
 
 <nz-card class="content-box" nzBordered>
-    <st #st [data]="service.$mock_url" [columns]="columns"
+    <st #st [data]="service.$api_get_recharge_page" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '400px' }"></st>
+        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '400px' }">
+        <ng-template st-row="transferBankAccount" let-item let-index="index" let-column="column">
+            {{ item.transferBankOpenName }} <br> {{ item.transferBankCardNumber }}
+        </ng-template>
+    </st>
 </nz-card>

src/app/routes/financial-management/components/recharge-record/recharge-record.component.ts

@@ -61,28 +61,25 @@ export class RechargeRecordComponent implements OnInit {
             hidden: true
           }
         },
-        orderSn2: {
+        rechargeNo: {
           type: 'string',
           title: '充值单号',
           ui: {
             placeholder: '请输入'
           }
         },
-        receiveName: {
+        rechargeStatus: {
           type: 'string',
           title: '充值状态',
           enum: [
             { label: '全部', value: '' },
-            { label: '充值中', value: '充值中' },
+            { label: '充值中', value: '1' },
-            { label: '已完成', value: '已完成' }
+            { label: '充值失败', value: '2' },
+            { label: '充值成功', value: '3' }
           ],
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            placeholder: '请选择'
-            change: (i: any) => {
-              this.sf.value.receiveName = i;
-              this.sf?.setValue('/receiveName', i);
-            }
           },
           default: ''
         },
@@ -95,7 +92,7 @@ export class RechargeRecordComponent implements OnInit {
             format: 'yyyy-MM-dd'
           } as SFDateWidgetSchema
         },
-        orderSn3: {
+        rechargeName: {
           type: 'string',
           title: '账户名称',
           ui: {
@@ -106,48 +103,53 @@ export class RechargeRecordComponent implements OnInit {
             }
           }
         },
-        receiveName2: {
+        accountType: {
           type: 'string',
           title: '账户类型',
           enum: [
             { label: '全部', value: '' },
-            { label: '货主账户', value: '货主账户' },
+            { label: '货主账户', value: '1' },
-            { label: '司机账户', value: '司机账户' }
+            { label: '司机账户', value: '2' },
+            { label: '营商账户', value: '3' }
           ],
           ui: {
             widget: 'select',
             placeholder: '请选择',
-            change: (i: any) => {
-              this.sf.value.receiveName2 = i;
-              this.sf?.setValue('/receiveName2', i);
-            },
             visibleIf: {
               expand: (value: boolean) => value
             }
           },
           default: ''
         },
-        page2: {
+        ltdid: {
           type: 'string',
           title: '网络货运人',
-          enum: [{ label: '全部', value: '全部' }],
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            visibleIf: {
+              expand: (value: boolean) => value
+            },
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarder()
+          }
+        },
+        bankType: {
+          type: 'string',
+          title: '银行类型',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '平安银行', value: '1' },
+            { label: '浦发银行', value: '2' }
+          ],
           ui: {
             widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
           },
-        orderSn23: {
+          default: ''
-          type: 'string',
-          title: '银行类型',
-          ui: {
-            placeholder: '请输入',
-            visibleIf: {
-              expand: (value: boolean) => value
-            }
-          }
         }
       }
     };
@@ -155,23 +157,23 @@ export class RechargeRecordComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '充值时间', index: 'updatedAt', type: 'date' },
+      { title: '充值时间', index: 'createTime', type: 'date' },
-      { title: '充值单号', index: 'callNo' },
+      { title: '充值单号', index: 'rechargeNo' },
-      { title: '网络货运人', index: 'callNo' },
+      { title: '网络货运人', index: 'ltdid' },
-      { title: '银行类型', index: 'callNo' },
+      { title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
-      { title: '账户类型', index: 'callNo' },
+      { title: '账户类型', index: 'accountType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行', 3: '运营商账户' } },
-      { title: '账户名称', index: 'callNo' },
+      { title: '账户名称', index: 'rechargeName' },
-      { title: '虚拟账户', index: 'callNo' },
+      { title: '虚拟账户', index: 'virtualAccount' },
-      { title: '充值金额', index: 'callNo' },
+      { title: '充值金额', index: 'rechargeAmount' },
-      { title: '充值银行账户', index: 'callNo',format: item=> `中国招商银行</br>6238293829388888` },
+      { title: '充值银行账户', render: 'transferBankAccount', format: item => `中国招商银行</br>6238293829388888` },
-      { title: '充值方式', index: 'callNo' },
+      { title: '充值方式', index: 'payChannel', type: 'enum', enum: { 1: '线下充值' } },
-      { title: '充值状态', index: 'callNo' },
+      { title: '充值状态', index: 'rechargeStatus', type: 'enum', enum: { 1: '充值中', 2: '充值失败', 3: '充值成功' } },
-      { title: '银行流水号', index: 'callNo' },
+      { title: '银行流水号', index: 'paySerialNumber' },
       {
         title: '操作',
         buttons: [
           {
-            text: '查看回单',
+            text: '查看回单'
             // click: item => this.router.navigate(['/financial-management/freight-account/detail/1'])
           }
         ]

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.html

@@ -23,7 +23,7 @@
 
 <nz-card class="content-box pt-xl" nzBordered>
 
-    <st #st [data]="service.$mock_url" [columns]="columns"
+    <st #st [data]="service.$api_get_account_blance" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"

src/app/routes/financial-management/components/transaction-flow/transaction-flow.component.ts

@@ -26,7 +26,13 @@ export class TransactionFlowComponent implements OnInit {
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
-      Object.assign(requestOptions.body, { ...this.sf.value });
+      Object.assign(requestOptions.body, {
+        ...this.sf.value,
+        createTime: {
+          start: this.sf.value.tcreateTimeime?.[0] || null,
+          end: this.sf.value.createTime?.[1] || null
+        }
+      });
     }
     return requestOptions;
   };
@@ -56,39 +62,44 @@ export class TransactionFlowComponent implements OnInit {
             hidden: true
           }
         },
-        orderSn: {
+        createTime: {
           title: '交易时间',
           type: 'string',
           ui: {
-            widget: 'date',
+            widget: 'sl-from-to-search',
-            mode: 'range',
+            format: 'yyyy-MM-dd',
-            format: 'yyyy-MM-dd'
+            placeholder: '请选择'
           } as SFDateWidgetSchema
         },
-        order2Sn: {
+        transactionNumber: {
           type: 'string',
           title: '流水号',
           ui: {
             placeholder: '请输入'
           }
         },
-        orderSn22: {
+        businessNumber: {
           type: 'string',
           title: '关联单号',
           ui: {
             placeholder: '请输入'
           }
         },
-        orderSn2: {
+        tradeType: {
           type: 'string',
           title: '交易类型',
           enum: [
-            { label: '全部', value: '全部' },
+            { label: '全部', value: '' },
-            { label: '订单支付', value: '订单支付' },
+            { label: '运费支付', value: 1 },
-            { label: '余额充值', value: '余额充值' },
+            { label: '附加费支付', value: 2 },
-            { label: '余额提现', value: '余额提现' },
+            { label: '运费退款', value: 3 },
-            { label: '资金分配', value: '资金分配' },
+            { label: '附加费退款', value: 4 },
-            { label: '资金回收', value: '资金回收' }
+            { label: '保费支付', value: 5 },
+            { label: '保费退款', value: 6 },
+            { label: '余额充值', value: 7 },
+            { label: '余额提现', value: 8 },
+            { label: '资金分配', value: 9 },
+            { label: '资金回收', value: 10 }
           ],
           ui: {
             widget: 'select',
@@ -96,15 +107,16 @@ export class TransactionFlowComponent implements OnInit {
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
           },
-        orderSn221: {
+          default: ''
+        },
+        incomeType: {
           type: 'string',
           title: '收支类型',
           enum: [
-            { label: '全部', value: '全部' },
+            { label: '全部', value: '部' },
-            { label: '收入', value: '收入' },
+            { label: '收入', value: 1 },
-            { label: '支出', value: '支出' }
+            { label: '支出', value: 2 }
           ],
           ui: {
             widget: 'select',
@@ -112,15 +124,17 @@ export class TransactionFlowComponent implements OnInit {
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
           },
-        orderS2n221: {
+          default: ''
+        },
+        channelSource: {
           type: 'string',
           title: '账户类型',
           enum: [
-            { label: '全部', value: '全部' },
+            { label: '全部', value: '' },
-            { label: '收入', value: '收入' },
+            { label: '货主端', value: '1' },
-            { label: '支出', value: '支出' }
+            { label: '司机端', value: '2' },
+            { label: '司机端', value: '3' }
           ],
           ui: {
             widget: 'select',
@@ -128,7 +142,8 @@ export class TransactionFlowComponent implements OnInit {
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
+          },
+          default: ''
         },
         orderS2n2221: {
           type: 'string',
@@ -143,38 +158,47 @@ export class TransactionFlowComponent implements OnInit {
         orderSn221f: {
           type: 'string',
           title: '所属项目',
-          enum: [{ label: '全部', value: '全部' }],
           ui: {
             widget: 'select',
             placeholder: '请选择',
+            allowClear: true,
             visibleIf: {
               expand: (value: boolean) => value
-            }
-          }
             },
-        ord1erSn221f: {
+            asyncData: () => this.service.getEnterpriseProject()
+          },
+          default: ''
+        },
+        bankType: {
           type: 'string',
           title: '银行类型',
-          enum: [{ label: '全部', value: '全部' }],
+          enum: [
+            { label: '全部', value: '' },
+            { label: '平安银行', value: '1' },
+            { label: '浦发银行', value: '2' }
+          ],
           ui: {
             widget: 'select',
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
-          }
           },
-        orde1rSn5221f: {
+          default: ''
+        },
+        ltdid: {
           type: 'string',
           title: '网络货运人',
-          enum: [{ label: '全部', value: '全部' }],
           ui: {
             widget: 'select',
             placeholder: '请选择',
+            allowClear: true,
             visibleIf: {
               expand: (value: boolean) => value
-            }
+            },
-          }
+            asyncData: () => this.service.getNetworkFreightForwarder()
+          },
+          default: ''
         }
       }
     };
@@ -182,19 +206,36 @@ export class TransactionFlowComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '交易时间', index: 'callNo', width: 150 },
+      { title: '交易时间', index: 'createTime', width: 150 },
-      { title: '流水号', index: 'no', width: 150 },
+      { title: '流水号', index: 'transactionNumber', width: 150 },
-      { title: '交易类型', index: 'callNo', width: 100 },
+      {
-      { title: '关联单号', index: 'callNo', width: 150 },
+        title: '交易类型',
-      { title: '账户类型', index: 'callNo', width: 100 },
+        index: 'tradeType',
-      { title: '账户名称', index: 'callNo', width: 100 },
+        width: 100,
-      { title: '所属项目', index: 'callNo', width: 100 },
+        type: 'enum',
-      { title: '收支类型', index: 'callNo', width: 100 },
+        enum: {
-      { title: '交易金额', index: 'callNo', width: 100 },
+          1: '运费支付',
-      { title: '账户余额', index: 'callNo', width: 100 },
+          2: '附加费支付',
-      { title: '网络货运人', index: 'callNo', width: 120 },
+          3: '运费退款',
-      { title: '银行类型', index: 'callNo', width: 100 },
+          4: '附加费退款',
-      { title: '银行流水号', index: 'callNo', width: 120 },
+          5: '保费支付',
+          6: '保费退款',
+          7: '余额充值',
+          8: '余额提现',
+          9: '资金分配',
+          10: '资金回收'
+        }
+      },
+      { title: '关联单号', index: 'businessNumber', width: 150 },
+      { title: '账户类型', index: 'channelSource', width: 100, enum: { 1: '货主端', 2: '司机端', 3: '运营平台' } },
+      { title: '账户名称', index: 'driverName', width: 100 },
+      { title: '所属项目', index: 'projectName', width: 100 },
+      { title: '收支类型', index: 'incomeType', width: 100, type: 'enum', enum: { 1: '收入', 2: '支出' } },
+      { title: '交易金额', index: 'amount', width: 100 },
+      { title: '账户余额', index: 'accountBalance', width: 100 },
+      { title: '网络货运人', index: 'ltdName', width: 120 },
+      { title: '银行类型', index: 'bankType', width: 100, type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' } },
+      { title: '银行流水号', index: 'channelPaySn', width: 120 },
       {
         title: '操作',
         fixed: 'right',

src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.html

@@ -10,40 +10,37 @@
     <nz-alert nzType="info" nzMessage="提现信息" class="mb-md"></nz-alert>
     <div se-container [labelWidth]="100">
         <se label="网络货运人">
-            天津怡亚通物流科技有限公司
+            {{formData?.ltdname}}
         </se>
         <se label="银行类型">
-            平安银行
+            {{formData?.bankType==='1'?'平安银行':'浦发银行'}}
         </se>
         <se label="提现单号">
-            EA202110012313
+            {{formData?.refundApplyCode}}
         </se>
         <se label="账户名称">
-            茅台集团
+            {{formData?.bankAccountName}}
         </se>
         <se label="提现时间">
-            2021-10-11 08:50:08
+            {{formData?.createTime}}
         </se>
         <se label="虚拟账户">
-            6202110111234
+            {{formData?.virtualAccount}}
         </se>
         <se label="提现状态">
-            已完成
+            {{refundStatus[formData?.virtualAccount]}}
         </se>
         <se label="提现金额">
-            10000.00
+            {{formData?.amount}}
         </se>
         <se label="银行流水号">
-            10.00
+            {{formData?.bankSerialNumber}}
         </se>
         <se label="提现至银行卡">
-            P20181230123012385756
+            {{formData?.bankId}}
-        </se>
-        <se label="提现至银行卡">
-            招商银行(8889)
         </se>
         <se label="银行回" col="1">
-            <img src="" alt="" style="width: 200px;height: 160px;">
+            <img [src]="formData?.bankRecallBill" alt="" style="width: 200px;height: 160px;">
         </se>
     </div>
 

src/app/routes/financial-management/components/withdrawals-record/withdrawals-detail/withdrawals-detail.component.ts

@@ -1,4 +1,6 @@
 import { Component, OnInit } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { FreightAccountService } from '../../../services/freight-account.service';
 
 @Component({
   selector: 'app-withdrawals-detail',
@@ -6,11 +8,32 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./withdrawals-detail.component.less']
 })
 export class WithdrawalsDetailComponent implements OnInit {
-  formDate: any = {};
+  formData: any = {};
-  constructor() {}
+
+  refundStatus: any = {
+    '1': '待审核',
+    '2': '提现中',
+    '3': '提现成功',
+    '4': '拒绝提现',
+    '5': '提现失败'
+  };
+
+  constructor(public service: FreightAccountService, private route: ActivatedRoute) {
+    const id = route.snapshot.params.id;
+    this.loadRefundDetail(id);
+  }
 
   ngOnInit(): void {}
 
+  loadRefundDetail(id: string) {
+    this.service.request(this.service.$api_get_refund_detail, { id }).subscribe(res => {
+      console.log(res);
+      if (res) {
+        this.formData = res;
+      }
+    });
+  }
+
   goBack() {
     history.go(-1);
   }

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.html

@@ -26,7 +26,7 @@
     <div nz-row nzGutter="8">
         <div nz-col [nzXl]="_$expand ? 24 : 18" [nzLg]="24" [nzSm]="24" [nzXs]="24">
             <sf #sf [schema]="searchSchema"
-                [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24 } }}" [compact]="true"
+                [ui]="{ '*': { spanLabelFixed: 90,grid: { lg: 8, md: 12, sm: 12, xs: 24,gutter:15 } }}" [compact]="true"
                 [button]="'none'"></sf>
         </div>
         <div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
@@ -44,12 +44,12 @@
 
 <nz-card class="content-box" nzBordered>
     <nz-tabset [nzTabBarExtraContent]="extraTemplate">
-        <nz-tab nzTitle="全部"></nz-tab>
+        <nz-tab nzTitle="全部" (nzClick)="changeRefundStatus()"></nz-tab>
-        <nz-tab nzTitle="待审核"></nz-tab>
+        <nz-tab nzTitle="待审核" (nzClick)="changeRefundStatus('1')"></nz-tab>
-        <nz-tab nzTitle="处理中"></nz-tab>
+        <nz-tab nzTitle="处理中" (nzClick)="changeRefundStatus('2')"></nz-tab>
-        <nz-tab nzTitle="提现成功"></nz-tab>
+        <nz-tab nzTitle="提现成功" (nzClick)="changeRefundStatus('3')"></nz-tab>
-        <nz-tab nzTitle="提现失败"></nz-tab>
+        <nz-tab nzTitle="提现失败" (nzClick)="changeRefundStatus('5')"></nz-tab>
-        <nz-tab nzTitle="已拒绝"></nz-tab>
+        <nz-tab nzTitle="已拒绝" (nzClick)="changeRefundStatus('4')"></nz-tab>
     </nz-tabset>
 
     <ng-template #extraTemplate>
@@ -65,11 +65,15 @@
         </div>
     </ng-template>
 
-    <st #st [data]="service.$mock_url" [columns]="columns"
+    <st #st [data]="service.$api_get_refund_page" [columns]="columns"
         [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, process: beforeReq }"
         [res]="{ reName: { list: 'data.records', total: 'data.total' } }"
         [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
-        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)"></st>
+        [loading]="service.http.loading" [scroll]="{ x:'1200px',y: '370px' }" (change)="stChange($event)">
+        <ng-template st-row="bankCardNumber" let-item let-index="index" let-column="column">
+            {{ item.bankName }} <br> {{ item.bankCardNumber }}
+        </ng-template>
+    </st>
 </nz-card>
 
 <ng-template #auditModal>

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.less

@@ -19,6 +19,10 @@
         padding-left : 16px;
         padding-right: 16px;
     }
+
+    .text-truncate {
+        white-space: normal;
+    }
 }
 
 .expend-options {

src/app/routes/financial-management/components/withdrawals-record/withdrawals-record.component.ts

@@ -24,13 +24,21 @@ export class WithdrawalsRecordComponent implements OnInit {
 
   selectedRows: any[] = [];
   totalCallNo = 0;
+  refundStatus: any = '';
   constructor(public service: FreightAccountService, private nzModalService: NzModalService, private router: Router) {}
 
   ngOnInit(): void {}
 
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
-      Object.assign(requestOptions.body, { ...this.sf.value });
+      Object.assign(requestOptions.body, {
+        ...this.sf.value,
+        createTime: {
+          start: this.sf.value.createTime?.[0] || '',
+          end: this.sf.value.createTime?.[1] || ''
+        },
+        refundStatus: this.refundStatus || null
+      });
     }
     return requestOptions;
   };
@@ -39,14 +47,15 @@ export class WithdrawalsRecordComponent implements OnInit {
     switch (e.type) {
       case 'checkbox':
         this.selectedRows = e.checkbox!;
-        this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.callNo, 0);
+        this.totalCallNo = this.selectedRows.reduce((total, cv) => total + cv.amount, 0);
         break;
     }
   }
 
-  approval(): void {}
+  changeRefundStatus(status?: string) {
-
+    this.refundStatus = status || null;
-  add(): void {}
+    this.st.load(1);
+  }
 
   auditAction(item: any) {
     const modal = this.nzModalService.create({
@@ -115,25 +124,19 @@ export class WithdrawalsRecordComponent implements OnInit {
             hidden: true
           }
         },
-        orderSn: {
+        refundApplyCode: {
           type: 'string',
           title: '提现单号',
           ui: {
             placeholder: '请输入'
           }
         },
-        receiveName: {
+        refundStatus: {
           type: 'string',
           title: '提现状态',
-          enum: [
-            { label: '全部', value: '全部' },
-            { label: '待审核', value: '待审核' },
-            { label: '处理中', value: '处理中' },
-            { label: '已完成', value: '已完成' },
-            { label: '已拒绝', value: '已拒绝' }
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'refund:apply:status' },
             placeholder: '请选择'
           }
         },
@@ -141,12 +144,13 @@ export class WithdrawalsRecordComponent implements OnInit {
           title: '提现时间',
           type: 'string',
           ui: {
-            widget: 'date',
+            widget: 'sl-from-to-search',
-            mode: 'range',
+            format: 'yyyy-MM-dd',
-            format: 'yyyy-MM-dd'
+            placeholder: '请选择',
+            nzShowTime: true
           } as SFDateWidgetSchema
         },
-        orderSn2: {
+        bankAccountName: {
           type: 'string',
           title: '账户名称',
           ui: {
@@ -156,38 +160,37 @@ export class WithdrawalsRecordComponent implements OnInit {
             }
           }
         },
-        receiveName2: {
+        accountType: {
           type: 'string',
           title: '账户类型',
-          enum: [
-            { label: '全部', value: '全部' },
-            { label: '货主账户', value: '货主账户' },
-            { label: '司机账户', value: '司机账户' }
-          ],
           ui: {
-            widget: 'select',
+            widget: 'dict-select',
+            params: { dictKey: 'bank:type' },
             placeholder: '请选择',
             visibleIf: {
               expand: (value: boolean) => value
             }
           }
         },
-        receiveName3: {
+        ltdid: {
           type: 'string',
           title: '网络货运人',
-          enum: [{ label: '全部', value: '全部' }],
           ui: {
             widget: 'select',
             placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.service.getNetworkFreightForwarder(),
             visibleIf: {
               expand: (value: boolean) => value
             }
           }
         },
-        orderSn23: {
+        bankType: {
           type: 'string',
           title: '银行类型',
           ui: {
+            widget: 'dict-select',
+            params: { dictKey: 'bankname:type' },
             placeholder: '请输入',
             visibleIf: {
               expand: (value: boolean) => value
@@ -201,32 +204,40 @@ export class WithdrawalsRecordComponent implements OnInit {
   private initST(): STColumn[] {
     return [
       { title: '', index: 'key', type: 'checkbox' },
-      { title: '提现时间', index: 'no' },
+      { title: '提现时间', index: 'createTime', width: 180 },
-      { title: '提现单号', index: 'callNo' },
+      { title: '提现单号', index: 'refundApplyCode', width: 120 },
-      { title: '网络货运人', index: 'callNo' },
+      { title: '网络货运人', index: 'ltdname', width: 120 },
-      { title: '银行类型', index: 'callNo' },
+      { title: '银行类型', index: 'bankType', type: 'enum', enum: { 1: '平安银行', 2: '浦发银行' }, width: 100 },
-      { title: '账户类型', index: 'callNo' },
+      { title: '账户类型', index: 'callNo', width: 100 },
-      { title: '账户名称', index: 'callNo' },
+      { title: '账户名称', index: 'callNo', width: 100 },
-      { title: '虚拟账户', index: 'callNo' },
+      { title: '虚拟账户', index: 'virtualAccount', width: 100 },
-      { title: '提现金额', index: 'callNo' },
+      { title: '提现金额', index: 'amount', width: 100 },
-      { title: '提现银行账户', index: 'callNo' },
+      { title: '提现银行账户', render: 'bankCardNumber', width: 120 },
-      { title: '提现状态', index: 'callNo' },
+      {
-      { title: '银行流水号', index: 'callNo' },
+        title: '提现状态',
-      { title: '失败原因', index: 'callNo' },
+        index: 'refundStatus',
+        type: 'enum',
+        enum: { '1': '待审核', '2': '提现中', '3': '提现成功', '4': '拒绝提现', '5': '提现失败' },
+        width: 100
+      },
+      { title: '银行流水号', index: 'bankSerialNumber', width: 120 },
+      { title: '失败原因', index: 'failCause', width: 150 },
       {
         title: '操作',
         buttons: [
           {
             text: '审核',
+            iif: item => item.refundStatus === '1',
             click: item => this.auditAction(item)
           },
           {
-            text: '查看回单'
+            text: '查看回单',
+            iif: item => item.refundStatus === '3'
             // click: item => this.auditAction(item)
           },
           {
             text: '详情',
-            click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/1'])
+            click: item => this.router.navigate(['/financial-management/withdrawals-record/detail/' + item.id])
           }
         ]
       }

src/app/routes/financial-management/services/freight-account.service.ts

@@ -13,7 +13,9 @@ export class FreightAccountService extends ShipperBaseService {
   $api_get_driver_account_page = '/api/fcc/accountBalance/getDriverAccountBalanceByOperator';
 
   // 运营端获取货主账户明细信息
-  $api_get_shipper_or_driver_account_detail = '/api/fcc/accountBalance/getShipperAccountBalanceDetailByOperator';
+  $api_get_shipper_account_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperByOperatorPage';
+  // 运营端获取司机账户明细信息
+  $api_get_driver_account_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceDriverByOperatorPage';
   // 运营端端获取货主交易收入与支出金额
   $api_get_shipper_account_balance_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperIncomeDetailByOperator';
   // 运营端端获取司机交易收入与支出金额
@@ -22,6 +24,21 @@ export class FreightAccountService extends ShipperBaseService {
   // 货主端获取账户余额交易明细
   $api_get_balance_by_shipper = '/api/fcc/accountBalanceDetail/getAccountBalanceByShipperPage';
 
+  // 查询订单支付申请表
+  $api_get_order_payment_page = '/api/fcc/billPaymentApplicationOBC/list/page';
+
+  // 查询提现申请表
+  $api_get_refund_page = '/api/fcc/refundApplicationSMC/list/page';
+  // 获取提现申请表详情
+  $api_get_refund_detail = '/api/fcc/refundApplicationSMC/get';
+
+  // 查询充值信息表
+  $api_get_recharge_page = '/api/fcc/rechargeInfo/list/page';
+  // 查询异常入金
+  $api_get_abnormal_gold_page = '/api/fcc/rechargeInfo/list/page';
+  // 运营端获取账户余额交易明细
+  $api_get_account_blance = '/api/fcc/accountBalanceDetail/getAccountBalanceByPage';
+
   constructor(public injector: Injector) {
     super(injector);
   }

src/app/shared/components/dict-select/dict-select.component.html

@@ -1,3 +1,3 @@
-<nz-select [(ngModel)]="value" (ngModelChange)="change($event)" *ngIf="dictList" [nzMode]="mode? mode:'default'">
+<nz-select [(ngModel)]="value" (ngModelChange)="change($event)" *ngIf="dictList" [nzMode]="mode? mode:'default'" nzPlaceHolder="请选择">
   <nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of dictList"></nz-option>
 </nz-select>

src/app/shared/services/business/shipper-base.service.ts

@@ -9,7 +9,7 @@ export class ShipperBaseService extends BaseService {
   $api_get_carless_carrier = ``; // 获取承运人
   $api_get_enterprise_project = `/api/mdc/cuc/enterpriseProject/getEnterpriseProjectList `; // 所属项目列表
   $api_get_staff_list = `/api/mdc/cuc/userApp/getStaffList`; //查询企业项目员工列表(录单员)
-  $api_get_network_freight_forwarder = `/api/mdc/networkTransporter/findAll`; // 获取网络货运人
+  $api_get_network_freight_forwarder = `/api/mdc/cuc/networkTransporter/findAll`; // 获取网络货运人
 
   constructor(public injector: Injector) {
     super(injector);