edit

src/app/routes/financial-management/components/receivable-order/receivable-order-detail/receivable-order-detail.component.html

@@ -30,7 +30,7 @@
                 {{headerInfo?.artoname}}
             </se>
             <se label="付款账户" required>
-                {{headerInfo?.arto}}
+                {{headerInfo?.artocode}}
             </se>
             <se label="应收金额">
                 {{headerInfo?.armoney | currency}}
@@ -38,10 +38,10 @@
         </div>
         <div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="8" [nzXs]="8" se-container [labelWidth]="100" col="1">
             <se label="银行类型">
-                {{headerInfo?.banktype}}
+                {{headerInfo?.banktypeLabel}}
             </se>
             <se label="收款类型" required>
-                {{headerInfo?.arvattype==='1'?'费用款项':''}}
+                {{headerInfo?.brmtypeLabel}}
             </se>
             <se label="银行水单">
                 {{headerInfo?.bankreceipt}}

src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.ts

@@ -37,13 +37,17 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
   beforeReq = (requestOptions: STRequestOptions) => {
     if (this.sf) {
       Object.assign(requestOptions.body, {
-        ...this.sf.value,
+        ...this.sf.value
+      });
+      if (this.sf.value.createTime) {
+        Object.assign(requestOptions.body, {
           createTime: {
             start: this.sf.value.createTime?.[0] || '',
             end: this.sf.value.createTime?.[1] || ''
           }
         });
       }
+    }
     Object.assign(requestOptions.body, { flag: this.tabType, listSource: 2 });
     return requestOptions;
   };
@@ -246,23 +250,34 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
             placeholder: '请输入'
           }
         },
-        contactName: {
+        name: {
-          title: '联系人',
+          title: '管理员',
           type: 'string',
           ui: {
-            placeholder: '请输入',
+            placeholder: '请输入'
+          }
+        },
+        approval1Status: {
+          type: 'string',
+          title: '企业类型',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
+          ui: {
+            widget: 'select',
             visibleIf: {
               expand: (value: boolean) => this.tabType === 1
             }
           }
         },
-        name: {
+        approval11Status: {
-          title: '管理员',
           type: 'string',
+          title: '公司所在地',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
           ui: {
-            placeholder: '请输入',
+            widget: 'select',
             visibleIf: {
-              expand: (value: boolean) => this.tabType !== 1
+              expand: (value: boolean) => this.tabType === 1 && value
             }
           }
         },
@@ -271,7 +286,10 @@ export class FreightComponentsEnterpriseAuditComponent implements OnInit {
           type: 'string',
           maxLength: 11,
           ui: {
-            placeholder: '请输入'
+            placeholder: '请输入',
+            visibleIf: {
+              expand: (value: boolean) => this.tabType === 2
+            }
           }
         },
         approvalStatus: {

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

@@ -1,7 +1,7 @@
 import { Component, OnInit, ViewChild } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { STChange, STColumn, STColumnBadge, STComponent, STData, STRequestOptions } from '@delon/abc/st';
-import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
+import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { DynamicSettingModalComponent, ShipperBaseService } from '@shared';
 import { NzModalService } from 'ng-zorro-antd/modal';
 import { AccountDetailComponent } from 'src/app/shared/components/account-detail/account-detail.component';
@@ -116,15 +116,49 @@ export class FreightComponentsListComponent implements OnInit {
             showRequired: false
           }
         },
-
+        sou1rce: {
-        networkTransporter: {
           type: 'string',
-          title: '网络货运人',
+          title: '企业类型',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
+          ui: {
+            widget: 'select'
+          }
+        },
+        sou11rce: {
+          type: 'string',
+          title: '公司所在地',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
           ui: {
             widget: 'select',
-            placeholder: '请选择',
+            visibleIf: {
-            allowClear: true,
+              expand: (value: boolean) => value
-            asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+            }
+          }
+        },
+        sou3rce: {
+          type: 'string',
+          title: '常用服务',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        sou1r3ce: {
+          type: 'string',
+          title: '客户类型',
+          enum: [{ label: '全部', value: '' }],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
           }
         },
         promotersTelephone: {
@@ -138,6 +172,79 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
+        promotersTe1le3phone: {
+          title: '合伙人',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        promotersTe1lep1hone: {
+          title: '客服人员',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        promotersTe1lep12hone: {
+          title: '审核人',
+          type: 'string',
+          ui: {
+            placeholder: '请输入',
+            showRequired: false,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
+        time: {
+          title: '申请时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd HH:mm:ss',
+            nzShowTime: true,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        tim1e: {
+          title: '审核时间',
+          type: 'string',
+          ui: {
+            widget: 'sl-from-to-search',
+            format: 'yyyy-MM-dd HH:mm:ss',
+            nzShowTime: true,
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          } as SFDateWidgetSchema
+        },
+        lockedStatus: {
+          type: 'string',
+          title: '企业状态',
+          enum: [
+            { label: '全部', value: '' },
+            { label: '正常', value: 0 },
+            { label: '冻结', value: 1 }
+          ],
+          default: '',
+          ui: {
+            widget: 'select',
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
+        },
         source: {
           type: 'string',
           title: '注册渠道',
@@ -155,14 +262,10 @@ export class FreightComponentsListComponent implements OnInit {
             }
           }
         },
-        lockedStatus: {
+        sourc2e: {
           type: 'string',
-          title: '企业状态',
+          title: '证件是否过期',
-          enum: [
+          enum: [{ label: '全部', value: '' }],
-            { label: '全部', value: '' },
-            { label: '正常', value: 0 },
-            { label: '冻结', value: 1 }
-          ],
           default: '',
           ui: {
             widget: 'select',
@@ -170,6 +273,19 @@ export class FreightComponentsListComponent implements OnInit {
               expand: (value: boolean) => value
             }
           }
+        },
+        networkTransporter: {
+          type: 'string',
+          title: '网络货运人',
+          ui: {
+            widget: 'select',
+            placeholder: '请选择',
+            allowClear: true,
+            asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
+            visibleIf: {
+              expand: (value: boolean) => value
+            }
+          }
         }
       }
     };
@@ -180,10 +296,10 @@ export class FreightComponentsListComponent implements OnInit {
     this.columns = [
       // { title: '', type: 'checkbox', className: 'text-center' },
       { title: '企业名称', className: 'text-center', index: 'enterpriseName', width: 350 },
-      { title: '企业税号', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 },
+      { title: '统一社会信用代码', className: 'text-center', index: 'unifiedSocialCreditCode', width: 200 },
+      { title: '公司所在地', className: 'text-center', index: 'unifi1edSocialCreditCode', width: 200 },
+      { title: '企业类型', className: 'text-center', index: 'unifiedSoci1alCreditCode', width: 200 },
       { title: '管理员', className: 'text-center', render: 'contacter', width: 150 },
-      { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 },
-      { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
       {
         title: '常用服务',
         className: 'text-center',
@@ -192,7 +308,10 @@ export class FreightComponentsListComponent implements OnInit {
         enum: { 10: '整车发货', 20: '大宗发货' },
         width: 140
       },
-      { title: '推广业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
+      { title: '业务员', className: 'text-center', render: 'promotersTelephone', width: 150 },
+      { title: '合伙人', className: 'text-center', render: 'promoter1sTelephone', width: 150 },
+      { title: '客服人员', className: 'text-center', render: 'promoter1sTelephone', width: 150 },
+      { title: '网络货运人', className: 'text-center', index: 'netTranName', width: 180 },
       {
         title: '注册渠道',
         className: 'text-center',
@@ -201,6 +320,20 @@ export class FreightComponentsListComponent implements OnInit {
         enum: { 1: '货主注册', 2: '平台添加', 3: '运营添加' },
         width: 130
       },
+      { title: '申请时间', className: 'text-center', index: 'netTra1nName', width: 180 },
+      { title: '审核时间', className: 'text-center', index: 'netTr1anName', width: 180 },
+      { title: '审核人', className: 'text-center', index: 'approvalUserName', width: 130 },
+      {
+        title: '保险认证状态',
+        className: 'text-center',
+        index: 'lockedSta1tus',
+        type: 'badge',
+        badge: {
+          0: { text: '正常', color: 'success' },
+          1: { text: '冻结', color: 'error' }
+        },
+        width: 130
+      },
       {
         title: '企业状态',
         className: 'text-center',