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

src/app/core/net/business.interceptor.ts

@@ -5,7 +5,7 @@ import {
   HttpInterceptor,
   HttpRequest,
   HttpResponse,
-  HttpResponseBase,
+  HttpResponseBase
 } from '@angular/common/http';
 import { Inject, Injectable, Optional } from '@angular/core';
 import { DA_SERVICE_TOKEN, ITokenService } from '@delon/auth';
@@ -21,7 +21,7 @@ export class BusinessInterceptor implements HttpInterceptor {
     private eaUserSrv: EAUserService,
     @Optional()
     @Inject(DA_SERVICE_TOKEN)
-    private tokenSrv: ITokenService,
+    private tokenSrv: ITokenService
   ) {}
   intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
     // 构造新的请求URL
@@ -30,8 +30,8 @@ export class BusinessInterceptor implements HttpInterceptor {
     req = this.attachAdditionalHeaders(req);
     // 后续操作
     return next.handle(req).pipe(
-      mergeMap((ev) => this.handlingBussinessResponseData(ev)),
+      mergeMap(ev => this.handlingBussinessResponseData(ev)),
-      catchError((err: HttpErrorResponse) => this.handlingBusinessErrors(err)),
+      catchError((err: HttpErrorResponse) => this.handlingBusinessErrors(err))
     );
   }
 
@@ -56,6 +56,7 @@ export class BusinessInterceptor implements HttpInterceptor {
     const header: any = {
       appId: this.envSrv.env.appId,
       tenantId: this.envSrv.env.tenantId,
+      enterpriseId: '0'
     };
 
     // 附加授权声明

src/app/layout/pro/components/user/user.component.html

@@ -8,14 +8,14 @@
       <i nz-icon nzType="user" class="mr-sm"></i>
       个人中心
     </div>
-    <div nz-menu-item routerLink="/pro/account/settings">
+    <!-- <div nz-menu-item routerLink="/pro/account/settings">
       <i nz-icon nzType="setting" class="mr-sm"></i>
       个人设置
     </div>
     <div nz-menu-item routerLink="/exception/trigger">
       <i nz-icon nzType="close-circle" class="mr-sm"></i>
       触发错误
-    </div>
+    </div> -->
     <li nz-menu-divider></li>
     <div nz-menu-item (click)="logout()">
       <i nz-icon nzType="logout" class="mr-sm"></i>

src/app/routes/dashboard/dashboard.component.html

@@ -1,9 +0,0 @@
-<div class="modal-header">
-  <div class="modal-title">编辑 {{ record.id }} 信息</div>
-</div>
-<sf  #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
-  <div class="modal-footer">
-    <button nz-button type="button" (click)="close()">关闭</button>
-    <button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="!sf.valid" [nzLoading]="http.loading">保存</button>
-  </div>
-</sf>

src/app/routes/dashboard/dashboard.component.less

@@ -1,6 +0,0 @@
-@import '~@delon/theme/index';
-
-:host {
-  ::ng-deep {
-  }
-}

src/app/routes/dashboard/dashboard.component.ts

@@ -1,66 +1,8 @@
-import { Component, ChangeDetectionStrategy, ChangeDetectorRef, TemplateRef, ViewChild } from '@angular/core';
+import { Component } from '@angular/core';
-import { STComponent, STColumn, STData, STChange } from '@delon/abc/st';
-import { SFSchema, SFUISchema } from '@delon/form';
-import { _HttpClient } from '@delon/theme';
-import { NzSafeAny } from 'ng-zorro-antd/core/types';
-import { NzMessageService } from 'ng-zorro-antd/message';
-import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
-import { map, tap } from 'rxjs/operators';
 
 @Component({
   selector: 'app-dashboard',
   templateUrl: './dashboard.component.html',
-  styleUrls: ['./dashboard.component.less'],
+  styleUrls: ['./dashboard.component.less']
-  changeDetection: ChangeDetectionStrategy.OnPush
 })
-export class DashboardComponent {
+export class DashboardComponent {}
-  @ViewChild('sf')
-  sf!: SFSchema;
-  record: any = {};
-  i: any;
-  schema: any = {
-    properties: {
-      no: { type: 'string', title: '编号' },
-      owner: { type: 'string', title: '姓名' },
-      callNo: { type: 'number', title: '调用次数' },
-      href: { type: 'string', title: '链接', format: 'uri', ui: { errors: { uri: '11' } } },
-      description: { type: 'string', title: '描述' }
-    },
-    required: ['owner', 'callNo', 'href', 'description']
-  };
-  ui: SFUISchema = {
-    '*': {
-      spanLabelFixed: 100,
-      grid: { span: 12 }
-    },
-    $no: {
-      widget: 'text'
-    },
-    $href: {
-      widget: 'string'
-    },
-    $description: {
-      widget: 'textarea',
-      grid: { span: 24 }
-    }
-  };
-
-  constructor(private msgSrv: NzMessageService, public http: _HttpClient) {}
-
-  ngOnInit(): void {
-    // if (this.record.id > 0) this.http.get(`/user/${this.record.id}`).subscribe(res => (this.i = res));
-  }
-
-  save(value: any): void {
-    console.log(this.sf.value);
-
-    // this.http.post(`/user/${this.record.id}`, value).subscribe(res => {
-    //   this.msgSrv.success('保存成功');
-    //   // this.modal.close(true);
-    // });
-  }
-
-  close(): void {
-    // this.modal.destroy();
-  }
-}

src/app/routes/order-management/components/risk/risk.component.ts

@@ -21,83 +21,73 @@ export class OrderManagementRiskComponent implements OnInit {
   schema: SFSchema = {};
   schemaView: SFSchema = {};
   auditMany = false;
-  auditId : any;
+  auditId: any;
   isVisibleRE = false;
   _$expand = false;
   @ViewChild('st') private readonly st!: STComponent;
   @ViewChild('sf', { static: false }) sf!: SFComponent;
   @ViewChild('sfView', { static: false }) sfView!: SFComponent;
   columns: STColumn[] = [];
-  datass: any = [
+  tabs = [
     {
-    one: '1',
+      name: '全部',
-    two: '1',
+      type: 5,
-    three: '1',
+      count: 0
-    id: 1
+    },
-   },
     {
-    one: '2',
+      name: '待申诉',
-    two: '2',
+      type: 5,
-    three: '2',
+      count: 0
-    id: 2
+    },
-   },
+    {
-];
+      name: '申诉中',
-  tabs = [  {
+      type: 5,
-    name: '全部',
+      count: 0
-    type: 5,
+    },
-    count: 0,
+    {
-  },
+      name: '申诉成功',
-  {
+      type: 5,
-    name: '待申诉',
+      count: 0
-    type: 5,
+    },
-    count: 0,
+    {
-  },
+      name: '申诉失败',
-  {
+      type: 5,
-    name: '申诉中',
+      count: 0
-    type: 5,
+    }
-    count: 0,
-  },
-  {
-    name: '申诉成功',
-    type: 5,
-    count: 0,
-  },
-  {
-    name: '申诉失败',
-    type: 5,
-    count: 0,
-  },
   ];
-  constructor(public service: SupplyManagementService, public service2: ShipperBaseService, private modal: NzModalService, public router: Router) { }
+  constructor(
+    public service: SupplyManagementService,
+    public service2: ShipperBaseService,
+    private modal: NzModalService,
+    public router: Router
+  ) {}
 
   /**
- * 查询参数
+   * 查询参数
- */
+   */
   get reqParams() {
     return {
-      ...this.sf?.value,
+      ...this.sf?.value
     };
   }
   get selectedRows() {
-    return this.st?.list.filter((item) => item.checked) || [];
+    return this.st?.list.filter(item => item.checked) || [];
   }
   ngOnInit(): void {
     this.initSF();
     this.initST();
   }
 
-
-
   /**
- * 初始化查询表单
+   * 初始化查询表单
- */
+   */
   initSF() {
     this.schema = {
       properties: {
         _$expand: { type: 'boolean', ui: { hidden: true } },
         billCode: {
           type: 'string',
-          title: '订单号',
+          title: '订单号'
         },
         resourceCode: {
           type: 'string',
@@ -112,8 +102,8 @@ export class OrderManagementRiskComponent implements OnInit {
           title: '装货地',
           ui: {
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
           }
         },
         dischargePlace: {
@@ -121,8 +111,8 @@ export class OrderManagementRiskComponent implements OnInit {
           title: '卸货地',
           ui: {
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
           }
         },
         // driverName: {
@@ -145,26 +135,25 @@ export class OrderManagementRiskComponent implements OnInit {
             onSearch: (q: any) => {
               if (!!q) {
                 return this.service
-                  .request(this.service.$api_get_getDriverInfo, { keyword: q,
+                  .request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
-                  model: 1, type: 1 })
+                  .pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
-                  .pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
                   .toPromise();
               } else {
                 return of([]);
               }
             },
             visibleIf: {
-              expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
-          } as SFSelectWidgetSchema,
+          } as SFSelectWidgetSchema
         },
         no9: {
           type: 'string',
           title: '车牌号',
           ui: {
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
           }
         },
         no10: {
@@ -172,8 +161,8 @@ export class OrderManagementRiskComponent implements OnInit {
           title: '收款人',
           ui: {
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
           }
         },
         wayBillType: {
@@ -182,11 +171,11 @@ export class OrderManagementRiskComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'goodresourceType' },
-            containAllLable:true,
+            containAllLable: true,
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
-          } as SFSelectWidgetSchema,
+          } as SFSelectWidgetSchema
         },
         shipperId: {
           title: '托运人',
@@ -194,11 +183,11 @@ export class OrderManagementRiskComponent implements OnInit {
           ui: {
             widget: 'dict-select',
             params: { dictKey: 'BulkFreightUnitPriceType' },
-            containAllLable:true,
+            containAllLable: true,
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
-          } as SFSelectWidgetSchema,
+          } as SFSelectWidgetSchema
         },
         enterpriseInfoName: {
           type: 'string',
@@ -207,11 +196,11 @@ export class OrderManagementRiskComponent implements OnInit {
             widget: 'select',
             placeholder: '请选择',
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
             },
             allowClear: true,
-            asyncData: () => this.service2.getNetworkFreightForwarder(),
+            asyncData: () => this.service2.getNetworkFreightForwarder()
-          },
+          }
         },
         createTime: {
           title: '创建时间',
@@ -221,12 +210,12 @@ export class OrderManagementRiskComponent implements OnInit {
             mode: 'range',
             format: 'yyyy-MM-dd',
             visibleIf: {
-              _$expand: (value: boolean) => value,
+              _$expand: (value: boolean) => value
-            },
+            }
-          } as SFDateWidgetSchema,
+          } as SFDateWidgetSchema
-        },
+        }
       },
-      type: 'object',
+      type: 'object'
     };
     this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
   }
@@ -253,7 +242,7 @@ export class OrderManagementRiskComponent implements OnInit {
         title: '异常信息',
         width: '100px',
         className: 'text-center',
-        index: 'abnormalCause',
+        index: 'abnormalCause'
       },
       { title: '托运人', index: 'shipperName', width: '120px', className: 'text-center' },
       { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
@@ -261,33 +250,31 @@ export class OrderManagementRiskComponent implements OnInit {
         title: '运费明细',
         className: 'text-center',
         width: '120px',
-        render: 'billExpenseDetailVOList',
+        render: 'billExpenseDetailVOList'
       },
       {
         title: '服务类型',
         className: 'text-center',
         width: '120px',
-        index: 'serviceTypeLabel',
+        index: 'serviceTypeLabel'
-      }, {
+      },
+      {
         title: '装货地',
         className: 'text-center',
         width: '180px',
-        index: 'loadingPlace',
+        index: 'loadingPlace'
-
       },
       {
         title: '卸货地',
         className: 'text-center',
         width: '180px',
-        index: 'dischargePlace',
+        index: 'dischargePlace'
-
       },
       {
         title: '货物信息',
         className: 'text-center',
         width: '180px',
-        render: 'goodsInfoVOList',
+        render: 'goodsInfoVOList'
-
       },
       {
         title: '承运司机',
@@ -315,18 +302,18 @@ export class OrderManagementRiskComponent implements OnInit {
         buttons: [
           {
             text: '审核',
-            click: (_record) => this.audit(_record),
+            click: _record => this.audit(_record)
           },
           {
             text: '详情',
-            click: (_record) => this.viewEvaluate(_record),
+            click: _record => this.viewEvaluate(_record)
-          },
+          }
-        ],
+        ]
-      },
+      }
     ];
   }
   initSTAudit(value: number) {
-    if(value == 1) {
+    if (value == 1) {
       this.schemaView = {
         properties: {
           billCode: {
@@ -334,8 +321,8 @@ export class OrderManagementRiskComponent implements OnInit {
             type: 'string',
             default: this.auditId,
             ui: {
-              widget: 'text',
+              widget: 'text'
-            },
+            }
           },
           representationsCause: {
             title: '备注',
@@ -345,9 +332,9 @@ export class OrderManagementRiskComponent implements OnInit {
               placeholder: '通过可以不用填写原因 ，拒绝必须说明原因',
               widget: 'textarea',
               autosize: { minRows: 3, maxRows: 6 }
-            },
+            }
-          },
+          }
-        },
+        }
       };
     } else {
       this.schemaView = {
@@ -357,8 +344,8 @@ export class OrderManagementRiskComponent implements OnInit {
             type: 'string',
             default: `已选${this.selectedRows?.length}条订单`,
             ui: {
-              widget: 'text',
+              widget: 'text'
-            },
+            }
           },
           representationsCause: {
             title: '备注',
@@ -368,12 +355,12 @@ export class OrderManagementRiskComponent implements OnInit {
               placeholder: '通过可以不用填写原因 ，拒绝必须说明原因',
               widget: 'textarea',
               autosize: { minRows: 3, maxRows: 6 }
-            },
+            }
-          },
+          }
-        },
+        }
       };
     }
-  
+
     this.uiView = { '*': { spanLabelFixed: 110, grid: { span: 24 } } };
   }
   /**
@@ -383,14 +370,14 @@ export class OrderManagementRiskComponent implements OnInit {
     return Object.keys(this.schema?.properties || {}).length;
   }
   /**
-  * 伸缩查询条件
+   * 伸缩查询条件
-  */
+   */
   expandToggle(): void {
     this._$expand = !this._$expand;
     this.sf?.setValue('/_$expand', this._$expand);
   }
   tabChange(item: any) {
-    console.log(item)
+    console.log(item);
   }
   /**
    * 重置表单
@@ -400,18 +387,15 @@ export class OrderManagementRiskComponent implements OnInit {
     this._$expand = false;
   }
 
-
+  // 获取录单员
-
-  // 获取录单员 
   getCatalogueMember() {
-    const params = {
+    const params = {};
-    };
     return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
-      map((res) => {
+      map(res => {
         if (res) {
-          console.log(res)
+          console.log(res);
         }
-      }),
+      })
     );
   }
 
@@ -421,74 +405,70 @@ export class OrderManagementRiskComponent implements OnInit {
   /**
    * 导入货源
    */
-  importGoodsSource() {
+  importGoodsSource() {}
 
-  }
+  /*
-
+   * 审核关闭弹窗
- /*
+   */
-  * 审核关闭弹窗
-  */
   handleCancel() {
-    this.isVisibleRE = false
+    this.isVisibleRE = false;
   }
-    /**
+  /**
-  * 审核通过按钮
+   * 审核通过按钮
-  */
+   */
   handleOK() {
-    console.log(this.sfView.value)
+    console.log(this.sfView.value);
     const parms = {
       id: this.sfView.value.billCode,
-      representationsCause: this.sfView.value.representationsCause,
+      representationsCause: this.sfView.value.representationsCause
-    }
+    };
-    this.service.request(this.service.$api_get_catalogue_member, parms).subscribe((res) => {
+    this.service.request(this.service.$api_get_catalogue_member, parms).subscribe(res => {
-      console.log(res)
+      console.log(res);
-      if(res) {
+      if (res) {
-        this.service.msgSrv.success('审核通过！')
+        this.service.msgSrv.success('审核通过！');
-       this.isVisibleRE = false
+        this.isVisibleRE = false;
-      } else{
+      } else {
-        this.service.msgSrv.error(res.msg)
+        this.service.msgSrv.error(res.msg);
-
       }
-    })
+    });
   }
-    /**
+  /**
-  * 审核拒绝按钮
+   * 审核拒绝按钮
-  */
+   */
   reject() {
-    console.log(this.sfView.value)
+    console.log(this.sfView.value);
     const parms = {
       id: this.sfView.value.billCode,
-      representationsCause: this.sfView.value.representationsCause,
+      representationsCause: this.sfView.value.representationsCause
-    }
+    };
-    this.service.request(this.service.$api_get_catalogue_member, parms).subscribe((res) => {
+    this.service.request(this.service.$api_get_catalogue_member, parms).subscribe(res => {
-      console.log(res)
+      console.log(res);
-      if(res) {
+      if (res) {
-        this.service.msgSrv.success('审核通过！')
+        this.service.msgSrv.success('审核通过！');
-       this.isVisibleRE = false
+        this.isVisibleRE = false;
-      } else{
+      } else {
-        this.service.msgSrv.error(res.msg)
+        this.service.msgSrv.error(res.msg);
-
       }
-    })
+    });
   }
-   /**
+  /**
-  *审核
+   *审核
-  */
+   */
   audit(item?: any) {
-    this.isVisibleRE = true
+    this.isVisibleRE = true;
-    if(item) {
+    if (item) {
-    this.auditId = item.id;
+      this.auditId = item.id;
-    this.initSTAudit(1);
+      this.initSTAudit(1);
     } else {
-    this.initSTAudit(2);
+      this.initSTAudit(2);
     }
-    console.log(item)
+    console.log(item);
   }
-   /**
+  /**
-  *查看详情
+   *查看详情
-  */
+   */
   viewEvaluate(item: any) {
-    console.log(item)
+    console.log(item);
-    this.router.navigate(['/order-management/risk-detail', item.id])
+    this.router.navigate(['/order-management/risk-detail', item.id]);
   }
 }

src/app/routes/sys-setting/components/staff-management/staff-management.component.html

@@ -32,8 +32,8 @@
         </nz-alert>
     </div>
 
-    <st #st [data]="url" [columns]="columns"
+    <st #st [data]="service.$api_get_enterprise_staff_page" [columns]="columns"
-        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
+        [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: {nameOrPhone: this.sf.value?.nameOrPhone} }"
         [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]="{ y: '370px' }" (change)="stChange($event)"></st>

src/app/routes/sys-setting/components/staff-management/staff-management.component.ts

@@ -17,11 +17,9 @@ export class StaffManagementComponent implements OnInit {
   @ViewChild('sf', { static: false })
   sf!: SFComponent;
 
-  url = `/rule?_allow_anonymous=true`;
-
   searchSchema: SFSchema = {
     properties: {
-      receiveName: {
+      nameOrPhone: {
         type: 'string',
         title: '输入搜索',
         ui: { placeholder: '手机号码 / 成员姓名' }
@@ -31,23 +29,21 @@ export class StaffManagementComponent implements OnInit {
 
   columns: STColumn[] = [
     { title: '', index: 'key', type: 'checkbox' },
-    { title: '员工姓名', index: 'no' },
+    { title: '员工姓名', index: 'name' },
-    { title: '手机号码', index: 'description' },
+    { title: '手机号码', index: 'telephone' },
-    { title: '角色', index: 'description' },
+    { title: '角色', render: 'description' },
     {
       title: '最后登录时间',
-      index: 'updatedAt',
+      index: 'lastLoginDate',
       type: 'date'
     },
     {
       title: '成员状态',
       className: 'text-center',
-      index: 'status',
+      index: 'stateLocked',
       type: 'badge',
       badge: {
         0: { text: '正常', color: 'success' },
-        2: { text: '废弃', color: 'warning' },
-        3: { text: '废弃', color: 'warning' },
         1: { text: '冻结', color: 'error' }
       }
     },
@@ -60,13 +56,13 @@ export class StaffManagementComponent implements OnInit {
         },
         {
           text: '恢复',
-          iif: item => item.status === 1,
+          iif: item => item.stateLocked === 1,
-          click: item => this.action(2)
+          click: item => this.action(item, 2)
         },
         {
           text: '冻结',
-          iif: item => item.status === 0,
+          iif: item => item.stateLocked === 0,
-          click: item => this.action(1)
+          click: item => this.action(item, 1)
         },
         {
           text: '超管转授',
@@ -75,8 +71,8 @@ export class StaffManagementComponent implements OnInit {
         },
         {
           text: '删除',
-          iif: item => item.status === 1,
+          iif: item => item.stateLocked === 0,
-          click: item => this.action(3)
+          click: item => this.action(item, 3)
         }
       ]
     }
@@ -84,8 +80,6 @@ export class StaffManagementComponent implements OnInit {
 
   selectedRows: any[] = [];
 
-  reqParams = { pageIndex: 1, pageSize: 10 };
-
   actionLabel = {
     1: { title: '确认冻结？', text: '冻结后用户在本系统将无法登录使用，请谨慎操作！' },
     2: { title: '确认恢复？', text: '恢复后用户在本系统的权限将一并重新开启。' },
@@ -100,13 +94,10 @@ export class StaffManagementComponent implements OnInit {
       case 'checkbox':
         this.selectedRows = e.checkbox!;
         break;
-      case 'filter':
-        this.st.load();
-        break;
     }
   }
 
-  action(type: 1 | 2 | 3) {
+  action(item: any, type: 1 | 2 | 3) {
     this.nzModalService.error({
       nzTitle: this.actionLabel[type].title,
       nzContent: `<label class="error-color">${this.actionLabel[type].text}</label>`,
@@ -115,6 +106,13 @@ export class StaffManagementComponent implements OnInit {
       nzOnOk: () => {
         switch (type) {
           case 1:
+            this.freeOrResumStaff({ appUserId: item.appUserId, freezeOrResume: true });
+            break;
+          case 2:
+            this.freeOrResumStaff({ appUserId: item.appUserId, freezeOrResume: false });
+            break;
+          case 3:
+            this.deleteStaff([item.appUserId]);
             break;
 
           default:
@@ -138,11 +136,13 @@ export class StaffManagementComponent implements OnInit {
   staffAction(item?: any) {
     const modal = this.nzModalService.create({
       nzContent: SystemStaffStaffModalComponent,
-      nzComponentParams: item ? { i: { ...item, roleId: '1,2,3', name: '用户名', phone: 18555555555 } } : { i: { id: 0 } },
+      nzComponentParams: item ? { i: { ...item } } : { i: { userId: 0 } },
       nzFooter: null
     });
     modal.afterClose.subscribe(res => {
-      this.st.load();
+      if (true) {
+        this.st.load();
+      }
     });
   }
 
@@ -152,4 +152,22 @@ export class StaffManagementComponent implements OnInit {
   resetSF() {
     this.sf.reset();
   }
+
+  private deleteStaff(params: any) {
+    this.service.request(this.service.$api_delete_staff, params).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('操作成功');
+        this.st.load();
+      }
+    });
+  }
+
+  private freeOrResumStaff(params: any) {
+    this.service.request(this.service.$api_free_or_resume_staff, params).subscribe(res => {
+      if (res) {
+        this.service.msgSrv.success('操作成功');
+        this.st.load();
+      }
+    });
+  }
 }

src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.html

@@ -2,7 +2,7 @@
   <div class="modal-title">{{ i.id === 0 ? '添加员工' : '编辑员工' }}</div>
 </div>
 <div>
-  <sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'">
+  <sf #sf [ui]="ui" [schema]="schema" [button]="'none'">
     <ng-template sf-template="account" let-me let-ui="ui" let-schema="schema">
       <sv-container labelWidth="1">
         <sv label="">

src/app/routes/sys-setting/components/staff-management/staff-modal/staff-modal.component.ts

@@ -29,32 +29,31 @@ export class SystemStaffStaffModalComponent implements OnInit {
   ) {}
 
   ngOnInit(): void {
-    if (this.i?.id !== 0) {
+    if (this.i?.userId !== 0) {
-      this.i.roleIds = this.i.roleId !== '' ? this.i.roleId.split(',') : [];
+      // this.i.roleIds = this.i.roleId !== '' ? this.i.roleId.split(',') : [];
     }
-    
+
     this.initSF(this.i);
   }
   initSF(staff: any) {
-    console.log(staff);
     this.schema = {
       properties: {
-        name: {
+        staffName: {
           title: '员工姓名',
           type: 'string',
           maxLength: 32,
-          ui: { widget: staff?.name ? 'text' : 'string', placeholder: '请输入员工姓名' },
+          ui: { widget: staff?.appUserId ? 'text' : 'string', placeholder: '请输入员工姓名' },
           default: staff.name
         },
-        phone: {
+        telephone: {
           title: '手机号码',
           type: 'string',
           format: 'mobile',
           maxLength: 11,
-          ui: { widget: staff?.phone ? 'text' : 'string', placeholder: '请输入员工手机号' },
+          ui: { widget: staff?.appUserId ? 'text' : 'string', placeholder: '请输入员工手机号' },
-          default: staff.phone
+          default: staff.telephone
         },
-        roleIds: {
+        roleId: {
           title: '角色',
           type: 'string',
           ui: {
@@ -80,7 +79,7 @@ export class SystemStaffStaffModalComponent implements OnInit {
           default: staff?.roleIds
         }
       },
-      required: ['name', 'phone', 'roleIds']
+      required: ['staffName', 'telephone']
     };
     this.ui = {
       '*': {
@@ -91,54 +90,36 @@ export class SystemStaffStaffModalComponent implements OnInit {
   }
 
   sure() {
-    if (!this.sf.value.roleIds || this.sf.value.roleIds.length === 0) {
+    // if (!this.sf.value.roleIds || this.sf.value.roleIds.length === 0) {
-      this.service.msgSrv.error('员工角色不能为空！');
+    //   this.service.msgSrv.error('员工角色不能为空！');
-      return;
+    //   return;
-    }
+    // }
-    this.roleNames = [];
+    if (this.i.userId === 0) {
-    this.roleList.forEach((item: { id: any; roleName: string }) => {
-      this.sf.value.roleIds.forEach((ele: any) => {
-        if (ele === item.id) {
-          this.roleNames.push(item.roleName);
-        }
-      });
-    });
-    if (this.i.id === 0) {
       const params: any = {
         ...this.sf.value,
-        roleId: this.sf.value.roleIds,
+        enterpriseId: 0,
-        roleNames: this.roleNames.join(','),
+        roleId: []
-        telephone: this.sf.value.phone,
-        staffName: this.sf.value.name
       };
-      // this.service.request(this.service.$api_addStaff, params).subscribe((res) => {
+      this.service.request(this.service.$api_add_staff, params).subscribe(res => {
-      //   console.log(res);
+        if (res) {
-      //   if (res) {
+          this.service.msgSrv.success('保存成功！');
-      //     this.service.msgSrv.success('保存成功！');
+          this.modal.close(true);
-      //     this.modal.close(true);
+        }
-      //   }
+      });
-      //   // this.showInviteFlag = true;
-      //   // this.inviteCode = res.inviteCode;
-      // });
     } else {
       const params: any = {
         appUserId: this.i.appUserId,
-        staffName: this.sf.value.name,
+        ...this.sf.value,
-        roleId: this.sf.value.roleIds,
+        roleId: []
-        telephone: this.i.telephone
       };
-      // this.service.request(this.service.$api_editorStaff, params).subscribe((res) => {
+      this.service.request(this.service.$api_edit_staff, params).subscribe(res => {
-      //   this.service.msgSrv.success('编辑成功！');
+        if (res) {
-      //   // this.loadMyIdentity();
+          this.service.msgSrv.success('编辑成功！');
-      //   this.modal.close(true);
+          this.modal.close(true);
-      // });
+        }
+      });
     }
   }
-  loadMyIdentity() {
-    this.enterpriseSrv.loadEnterpises().subscribe((data: any[]) => {
-      this.enterpriseSrv.setCache(data);
-    });
-  }
 
   close() {
     this.modal.destroy();

src/app/routes/sys-setting/services/system.service.ts

@@ -5,6 +5,20 @@ import { BaseService } from 'src/app/shared/services';
   providedIn: 'root'
 })
 export class SystemService extends BaseService {
+
+
+  // 分页查询企业项目员工列表
+  $api_get_enterprise_staff_page = '/api/mdc/cuc/userApp/getEnterpriseProjectStaffListPage';
+  // 添加员工
+  $api_add_staff = '/api/mdc/cuc/userApp/addStaff';
+  // 编辑员工
+  $api_edit_staff = '/api/mdc/cuc/userApp/editorStaff';
+  // 删除应用用户(员工)
+  $api_delete_staff = '/api/mdc/cuc/userApp/deleteAppUser';
+  // 冻结或恢复员工
+  $api_free_or_resume_staff = '/api/mdc/cuc/userApp/freezeOrResumeStaff';
+
+
   $api_getAllFunctionInfoByAppId: string = '';
   $api_getRoleTemplateInfo: string = '';
   $api_getFunctionButtonInfo: string = '';

src/assets/mocks/menu-data.json

@@ -4,23 +4,6 @@
       "text": "样例",
       "hideInBreadcrumb": true,
       "children": [
-        {
-          "text": "样例",
-          "icon": "anticon anticon-dashboard",
-          "group": true,
-          "children": [
-            {
-              "text": "Zorro案例",
-              "icon": "anticon anticon-dashboard",
-              "link": "/demo/zorro"
-            },
-            {
-              "text": "Alain案例",
-              "icon": "anticon anticon-dashboard",
-              "link": "/demo/alain"
-            }
-          ]
-        },
         {
           "text": "用户中心",
           "icon": "anticon anticon-dashboard",
@@ -98,38 +81,27 @@
           ]
         },
         {
-          "text": "票务管理",
+          "text": "运力管理",
           "icon": "anticon anticon-dashboard",
           "group": true,
           "children": [
             {
-              "text": "开票申请",
+              "text": "车辆列表",
-              "link": "/ticket/invoice-requested"
+              "link": "/vehicle/list"
             },
             {
-              "text": "已开发票",
+              "hide": true,
-              "link": "/ticket/invoice-list"
+              "text": "车辆列表详情",
+              "link": "/vehicle/list/detail/:id"
             },
             {
-              "text": "ETC发票",
+              "text": "车辆审核列表",
-              "children": [
+              "link": "/vehicle/audit"
-                {
+            },
-                  "text": "申请发票",
+            {
-                  "link": "/ticket/etc-invoice-requested"
+              "hide": true,
-                },
+              "text": "车辆审核列表详情",
-                {
+              "link": "/vehicle/audit/detail/:id"
-                  "text": "运单开票记录",
-                  "link": "/ticket/etc-invoice-list"
-                },
-                {
-                  "text": "已开发票",
-                  "link": "/ticket/etc-invoiced-logs"
-                },
-                {
-                  "text": "黑名单",
-                  "link": "/ticket/etc-blacklist"
-                }
-              ]
             }
           ]
         },
@@ -272,31 +244,6 @@
             }
           ]
         },
-        {
-          "text": "运力管理",
-          "icon": "anticon anticon-dashboard",
-          "group": true,
-          "children": [
-            {
-              "text": "车辆列表",
-              "link": "/vehicle/list"
-            },
-            {
-              "hide": true,
-              "text": "车辆列表详情",
-              "link": "/vehicle/list/detail/:id"
-            },
-            {
-              "text": "车辆审核列表",
-              "link": "/vehicle/audit"
-            },
-            {
-              "hide": true,
-              "text": "车辆审核列表详情",
-              "link": "/vehicle/audit/detail/:id"
-            }
-          ]
-        },
         {
           "text": "财务管理",
           "icon": "anticon anticon-dashboard",
@@ -329,6 +276,42 @@
             }
           ]
         },
+        {
+          "text": "票务管理",
+          "icon": "anticon anticon-dashboard",
+          "group": true,
+          "children": [
+            {
+              "text": "开票申请",
+              "link": "/ticket/invoice-requested"
+            },
+            {
+              "text": "已开发票",
+              "link": "/ticket/invoice-list"
+            },
+            {
+              "text": "ETC发票",
+              "children": [
+                {
+                  "text": "申请发票",
+                  "link": "/ticket/etc-invoice-requested"
+                },
+                {
+                  "text": "运单开票记录",
+                  "link": "/ticket/etc-invoice-list"
+                },
+                {
+                  "text": "已开发票",
+                  "link": "/ticket/etc-invoiced-logs"
+                },
+                {
+                  "text": "黑名单",
+                  "link": "/ticket/etc-blacklist"
+                }
+              ]
+            }
+          ]
+        },
         {
           "text": "合同管理",
           "icon": "anticon anticon-dashboard",