fix bug

2021-12-09 19:21:22 +08:00
parent d4a4b45194
commit b513099359
11 changed files with 177 additions and 160 deletions
--- a/src/app/routes/vehicle/components/list/detail/detail.component.ts
+++ b/src/app/routes/vehicle/components/list/detail/detail.component.ts
@ -4,7 +4,7 @@ import { STColumn, STComponent } from '@delon/abc/st';
 import { SFComponent, SFDateWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
 import { ModalHelper, _HttpClient } from '@delon/theme';
 import { NzMessageService } from 'ng-zorro-antd/message';
-import { UsermanageService } from '../../../services/vehicle.service';
+import { VehicleService } from '../../../services/vehicle.service';
 import { VehicleComponentsListEditComponent } from '../edit/edit.component';
 import { VehicleImgViewComponent } from '../img-view/img-view.component';

@ -68,7 +68,7 @@ export class VehicleComponentsListDetailComponent implements OnInit {
  constructor(
    private http: _HttpClient,
    private modal: ModalHelper,
-    public service: UsermanageService,
+    public service: VehicleService,
    private route: ActivatedRoute,
    private modalHelper: ModalHelper,
    private msgSrv: NzMessageService,
--- a/src/app/routes/vehicle/components/list/edit/edit.component.ts
+++ b/src/app/routes/vehicle/components/list/edit/edit.component.ts
@ -4,7 +4,7 @@ import { EAEnvironmentService, CaptchaComponent, EAUserService } from '@shared';
 import { Observable, Observer } from 'rxjs';
 import { NzMessageService } from 'ng-zorro-antd/message';
 import { NzModalRef } from 'ng-zorro-antd/modal';
-import { UsermanageService } from '../../../services/vehicle.service';
+import { VehicleService } from '../../../services/vehicle.service';
@Component({
  selector: 'app-setting-components-info-edit',
  templateUrl: './edit.component.html',
@ -23,7 +23,7 @@ export class VehicleComponentsListEditComponent implements OnInit {
  constructor(
    private modal: NzModalRef,
    public msgSrv: NzMessageService,
-    public service: UsermanageService,
+    public service: VehicleService,
    private envSrv: EAEnvironmentService,
  ) {}

--- a/src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts
+++ b/src/app/routes/vehicle/components/list/img-view/img-view.component.spec.ts
@ -1,18 +1,26 @@
+/*
+ * @Author: your name
+ * @Date: 2021-12-07 17:30:18
+ * @LastEditTime: 2021-12-09 17:47:33
+ * @LastEditors: your name
+ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+ * @FilePath: \tms-obc-web\src\app\routes\vehicle\components\list\img-view\img-view.component.spec.ts
+ */
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SettingComponentsInfoImgViewComponent } from './img-view.component';
+import { VehicleImgViewComponent } from './img-view.component';

-describe('SettingComponentsInfoImgViewComponent', () => {
-  let component: SettingComponentsInfoImgViewComponent;
-  let fixture: ComponentFixture<SettingComponentsInfoImgViewComponent>;
+describe('VehicleImgViewComponent', () => {
+  let component: VehicleImgViewComponent;
+  let fixture: ComponentFixture<VehicleImgViewComponent>;

  beforeEach(async(() => {
    TestBed.configureTestingModule({
-      declarations: [SettingComponentsInfoImgViewComponent],
+      declarations: [VehicleImgViewComponent],
    }).compileComponents();
  }));

  beforeEach(() => {
-    fixture = TestBed.createComponent(SettingComponentsInfoImgViewComponent);
+    fixture = TestBed.createComponent(VehicleImgViewComponent);
    component = fixture.componentInstance;
    fixture.detectChanges();
  });
--- a/src/app/routes/vehicle/components/list/list.component.html
+++ b/src/app/routes/vehicle/components/list/list.component.html
@ -1,7 +1,7 @@
 <!--
 * @Author: your name
 * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-12-01 20:58:57
+ * @LastEditTime: 2021-12-09 17:56:02
 * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\usercenter\components\freight\list\list.component.html
@ -52,7 +52,7 @@
    #st
    [bordered]="true"
    [columns]="columns"
-    [data]='datalist'
+    [data]='service.$api_get_operate_list'
    [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
    [res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
    [page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
--- a/src/app/routes/vehicle/components/list/list.component.ts
+++ b/src/app/routes/vehicle/components/list/list.component.ts
@ -3,7 +3,7 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st';
 import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
 import { NzModalService } from 'ng-zorro-antd/modal';
-import { UsermanageService } from '../../../vehicle/services/vehicle.service';
+import { VehicleService } from '../../../vehicle/services/vehicle.service';
@Component({
  selector: 'app-Freight-components-list',
  templateUrl: './list.component.html',
@ -46,7 +46,7 @@ export class VehicleComponentsListComponent implements OnInit {
  @ViewChild('st', { static: false }) st!: STComponent;
  @ViewChild('sf', { static: false }) sf!: SFComponent;

-  constructor(public service: UsermanageService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
+  constructor(public service: VehicleService, private modal: NzModalService, private router: Router, private ar: ActivatedRoute) {}
  /**
   * 查询字段个数navigate
   */
--- a/src/app/routes/vehicle/services/vehicle.service.ts
+++ b/src/app/routes/vehicle/services/vehicle.service.ts
@ -1,8 +1,8 @@
 /*
 * @Author: your name
 * @Date: 2021-11-29 15:22:34
- * @LastEditTime: 2021-11-29 15:43:42
- * @LastEditors: your name
+ * @LastEditTime: 2021-12-09 17:55:37
+ * @LastEditors: Please set LastEditors
 * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 * @FilePath: \tms-obc-web\src\app\routes\usercenter\services\usercenter.service.ts
 */
@ -15,75 +15,9 @@ import { EAFileUtil } from 'src/app/shared/utils/file.util';
@Injectable({
  providedIn: 'root',
 })
-export class UsermanageService extends BaseService {
-  public $api_add_one!: string;
-  public $api_add_many!: string;
-  public $api_edit_one!: string;
-  public $api_edit_many!: string;
-  public $api_del_one!: string;
-  public $api_del_many!: string;
-  public $api_get_many!: string;
-  public $api_get_one!: string;
-  public $api_get_page!: string;
-  public $api_export!: string;
-  public $api_import!: string;
-  public $api_import_download_tpl!: string;
-  // 平台用户列表
-  $api_get_page_user = '/cuc/userApp/getOperatorUserList?_allow_anonymous=true';
-  // 获取供应商采购商应用
-  $api_get_supplier_purchaserApp = '/cuc/appInfo/getSupplierPurchaserApp?_allow_anonymous=true';
-
-  // 供应商列表
-  $api_get_supplier_page = '/cuc/operator/list/listSupplierPage?_allow_anonymous=true';
-  // 供应商详情
-  $api_get_supplier_info = '/cuc/operator/selectSupplierDetailInfo?_allow_anonymous=true';
-  // 用户冻结或恢复应用用户
-  $api_set_freezeOrResume = '/cuc/operator/updateSupplierInfo?_allow_anonymous=true';
-  // 获取一、二、三级地区详情
-  $api_getRegionToThree = '/cms/region/getRegionToThree?_allow_anonymous=true';
-  // 根据地区code查询列表
-  $api_getRegionByCode = '/cms/region/getRegionByCode?_allow_anonymous=true';
-
-  // 根据地区code查询地区详情
-  $api_get_region_detailByCode = '/cms/region/getRegionDetailByCode?_allow_anonymous=true';
-  // 查询供应商申请列表分页
-  $api_get_supplier_audit_page = `/cuc/operator/audit/listSupplierPage?_allow_anonymous=true`;
-  // 查询供应商入驻详情
-  $api_get_supplier_entryInfo = `/cuc/operator/selectSupplierEntryDetailInfo?_allow_anonymous=true`;
-  // 审核供应商
-  $api_auditSupplier = `/cuc/operator/auditSupplier?_allow_anonymous=true`;
-  // 查询采购商列表分页
-  $api_get_purchaserList = `/cuc/operator/list/queryPurchaserPage`;
-  // 查询采购商申请列表分页
-  $api_get_purchaserAudit = `/cuc/operator/audit/queryPurchaserPage`;
-  // 查询采购商认证详情
-  $api_get_purchaser_detailInfo = `/cuc/operator/selectPurchaserDetailInfo`;
-
-  // 查询采购商审核总数
-  $api_query_purchaser_count = `/cuc/operator/queryPurchaserCount`;
-  // 获取供应商审核总数
-  $api_query_supplier_count = `/cuc/operator/querySupplierCount`;
-
-  // 审核企业详情
-  $api_get_cache_enterprise_info = '';
-  // 获取审核进度
-  $api_get_progress = '/cuc/reviewRecordInfo/getReviewProgress';
-  // 查询流程信息列表
-  $api_get_progressInfoList = '/cuc/processInfo/getProcessInfoList';
-  // 审核通过
-  $api_set_audit_pass = '/cuc/reviewRecordInfo/reviewPassed';
-  // 审核拒绝
-  $api_set_audit_reject = '/cuc/reviewRecordInfo/reviewRejected';
-
-  // 发起签约 //撤回签约
-  $api_get_startSigning = `/cuc/operator/startSigning?_allow_badcode=true`;
-
-  // 发起续约 //撤回续约
-  $api_get_startRenewalContract = `/cuc/operator/startRenewalContract?_allow_badcode=true`;
-  // 获取审核记录
-  $api_get_reviewRecordInfoList = '/cuc/reviewRecordInfo/getReviewRecordInfoList';
-  // 查看合同详情
-  $api_get_contract_detail = `/scce/etc/etc/contractDetail/getContractByContractNo`;
+export class VehicleService extends BaseService {
+  // 查询车辆认证表
+  $api_get_operate_list = `/api/mdc/cuc/carLicense/operate/list/page`;

  constructor(public injector: Injector) {
    super(injector);