dev
胡锐 3 days ago
parent 00630e5fb2
commit d8995cee73
  1. 1
      angular.json
  2. 3359
      package-lock.json
  3. 24
      package.json
  4. 6
      src/app/admin/activity-money/merchant-allocation/merchant-allocation.component.ts
  5. 6
      src/app/admin/activity-money/prize-pool/prize-pool.component.ts
  6. 6
      src/app/admin/agent/agent-add/agent-add.component.ts
  7. 8
      src/app/admin/agent/agent-list/agent-list.component.ts
  8. 6
      src/app/admin/agent/agent-update/agent-update.component.ts
  9. 6
      src/app/admin/cms/cms-category-module/cms-category-module.component.ts
  10. 6
      src/app/admin/cms/cms-category/cms-category.component.ts
  11. 8
      src/app/admin/cms/cms-content-add/cms-content-add.component.ts
  12. 6
      src/app/admin/cms/cms-content-edit/cms-content-edit.component.ts
  13. 6
      src/app/admin/cms/cms-content-view/cms-content-view.component.ts
  14. 8
      src/app/admin/cms/cms-content/cms-content.component.ts
  15. 6
      src/app/admin/company/company-add/company-add.component.ts
  16. 8
      src/app/admin/company/company-list/company-list.component.ts
  17. 6
      src/app/admin/company/company-update/company-update.component.ts
  18. 14
      src/app/admin/device/device-list/device-list.component.ts
  19. 6
      src/app/admin/device/device-order-list/device-order-list.component.ts
  20. 6
      src/app/admin/login/admin-login/admin-login.component.ts
  21. 6
      src/app/admin/login/agent-login/agent-login.component.ts
  22. 6
      src/app/admin/login/login/login.component.ts
  23. 6
      src/app/admin/login/salesman-login/salesman-login.component.ts
  24. 10
      src/app/admin/mer/mer-list/mer-list.component.ts
  25. 8
      src/app/admin/navigation/navigation.component.ts
  26. 14
      src/app/admin/pay-qr-code/pay-qr-code-list/pay-qr-code-list.component.ts
  27. 8
      src/app/admin/platform/platform-list/platform-list.component.ts
  28. 6
      src/app/admin/salesman/salesman-add/salesman-add.component.ts
  29. 6
      src/app/admin/salesman/salesman-list/salesman-list.component.ts
  30. 6
      src/app/admin/salesman/salesman-update/salesman-update.component.ts
  31. 8
      src/app/admin/store-device/store-device-list/store-device-list.component.ts
  32. 6
      src/app/admin/store-discount-activity/store-discount-activity-edit/store-discount-activity-edit.component.ts
  33. 6
      src/app/admin/store-discount-activity/store-discount-activity-list/store-discount-activity-list.component.ts
  34. 6
      src/app/admin/store/store-list/store-list.component.ts
  35. 8
      src/app/admin/system/menu/menu.component.ts
  36. 6
      src/app/admin/system/permission/permission.component.ts
  37. 8
      src/app/admin/system/system-organization/system-organization.component.ts
  38. 4
      src/app/admin/system/system-role-show/system-role-show.component.ts
  39. 8
      src/app/admin/system/system-role/system-role.component.ts
  40. 8
      src/app/admin/system/system-user/system-user.component.ts
  41. 8
      src/app/admin/system/version/version.component.ts
  42. 6
      src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.ts
  43. 6
      src/app/admin/trade-checking/trade-checking/trade-checking.component.ts
  44. 6
      src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts
  45. 2
      tsconfig.json

@ -181,7 +181,6 @@
} }
} }
}, },
"defaultProject": "gratia-pay-web",
"cli": { "cli": {
"analytics": "0444f874-a08a-4231-b156-0967f0496267" "analytics": "0444f874-a08a-4231-b156-0967f0496267"
} }

3359
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -11,14 +11,14 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~13.4.0", "@angular/animations": "^14.3.0",
"@angular/common": "~13.4.0", "@angular/common": "^14.3.0",
"@angular/compiler": "~13.4.0", "@angular/compiler": "^14.3.0",
"@angular/core": "~13.4.0", "@angular/core": "^14.3.0",
"@angular/forms": "~13.4.0", "@angular/forms": "^14.3.0",
"@angular/platform-browser": "~13.4.0", "@angular/platform-browser": "^14.3.0",
"@angular/platform-browser-dynamic": "~13.4.0", "@angular/platform-browser-dynamic": "^14.3.0",
"@angular/router": "~13.4.0", "@angular/router": "^14.3.0",
"@notadd/ngx-neditor": "^1.0.2", "@notadd/ngx-neditor": "^1.0.2",
"@types/jquery": "^3.5.0", "@types/jquery": "^3.5.0",
"echarts": "^4.9.0", "echarts": "^4.9.0",
@ -30,10 +30,10 @@
"zone.js": "~0.11.4" "zone.js": "~0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~13.3.11", "@angular-devkit/build-angular": "^14.2.13",
"@angular/cli": "~13.3.11", "@angular/cli": "^14.2.13",
"@angular/compiler-cli": "~13.4.0", "@angular/compiler-cli": "^14.3.0",
"@angular/language-service": "~13.4.0", "@angular/language-service": "^14.3.0",
"@types/jasmine": "~3.5.0", "@types/jasmine": "~3.5.0",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"@types/node": "^12.11.1", "@types/node": "^12.11.1",

@ -4,7 +4,7 @@ import { Component, OnInit } from '@angular/core';
import {TradeOrderService} from '../../../services/trade-order.service'; import {TradeOrderService} from '../../../services/trade-order.service';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {environment} from '../../../../environments/environment'; import {environment} from '../../../../environments/environment';
import { ActivityMoneyService } from 'src/app/services/activity-money.service'; import { ActivityMoneyService } from 'src/app/services/activity-money.service';
@ -19,7 +19,7 @@ export class MerchantAllocationComponent implements OnInit {
loading = false; loading = false;
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
@ -40,7 +40,7 @@ export class MerchantAllocationComponent implements OnInit {
private modal: NzModalService, private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
private activityMoneyService:ActivityMoneyService, private activityMoneyService:ActivityMoneyService,
private form: FormBuilder) { } private form: UntypedFormBuilder) { }
ngOnInit(): void { ngOnInit(): void {

@ -3,7 +3,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {environment} from '../../../../environments/environment'; import {environment} from '../../../../environments/environment';
import { ActivityMoneyService } from 'src/app/services/activity-money.service'; import { ActivityMoneyService } from 'src/app/services/activity-money.service';
@ -17,7 +17,7 @@ export class PrizePoolComponent implements OnInit {
loading = false; loading = false;
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
@ -26,7 +26,7 @@ export class PrizePoolComponent implements OnInit {
private modal: NzModalService, private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
private activityMoneyService:ActivityMoneyService, private activityMoneyService:ActivityMoneyService,
private form: FormBuilder) { } private form: UntypedFormBuilder) { }
ngOnInit(): void { ngOnInit(): void {

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {AgentService} from '../../../services/agent.service'; import {AgentService} from '../../../services/agent.service';
import {ValidatorsService} from '../../../services/validators.service'; import {ValidatorsService} from '../../../services/validators.service';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
@ -12,10 +12,10 @@ import {ActivatedRoute, Router} from '@angular/router';
}) })
export class AgentAddComponent implements OnInit { export class AgentAddComponent implements OnInit {
agentForm: FormGroup; agentForm: UntypedFormGroup;
btnLoading = false; btnLoading = false;
constructor(private form: FormBuilder, constructor(private form: UntypedFormBuilder,
private modal: NzModalService, private modal: NzModalService,
private agentService: AgentService, private agentService: AgentService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {AgentService} from '../../../services/agent.service'; import {AgentService} from '../../../services/agent.service';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {CompanyService} from '../../../services/company.service'; import {CompanyService} from '../../../services/company.service';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
@ -17,8 +17,8 @@ export class AgentListComponent implements OnInit {
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
tradeTakeConfigForm: FormGroup; tradeTakeConfigForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
@ -36,7 +36,7 @@ export class AgentListComponent implements OnInit {
private commonsService: CommonsService, private commonsService: CommonsService,
private localStorageService: LocalStorageService, private localStorageService: LocalStorageService,
private tradeTakeConfigService: TradeTakeConfigService, private tradeTakeConfigService: TradeTakeConfigService,
private form: FormBuilder) { private form: UntypedFormBuilder) {
this.userObjectType = Number(this.localStorageService.get(ADMIN_INFO_OBJECT)['secUser']['objectType']); this.userObjectType = Number(this.localStorageService.get(ADMIN_INFO_OBJECT)['secUser']['objectType']);
} }

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {AgentService} from '../../../services/agent.service'; import {AgentService} from '../../../services/agent.service';
import {ActivatedRoute, Params, Router} from '@angular/router'; import {ActivatedRoute, Params, Router} from '@angular/router';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
@Component({ @Component({
@ -11,7 +11,7 @@ import {NzModalService} from 'ng-zorro-antd';
}) })
export class AgentUpdateComponent implements OnInit { export class AgentUpdateComponent implements OnInit {
agentForm: FormGroup; agentForm: UntypedFormGroup;
btnLoading = false; btnLoading = false;
dataObject: any = { dataObject: any = {
@ -20,7 +20,7 @@ export class AgentUpdateComponent implements OnInit {
} }
}; };
constructor(private form: FormBuilder, constructor(private form: UntypedFormBuilder,
private modal: NzModalService, private modal: NzModalService,
private agentService: AgentService, private agentService: AgentService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, FormControl, UntypedFormGroup, Validators} from '@angular/forms';
import {HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse} from '@angular/common/http'; import {HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse} from '@angular/common/http';
import {NzMessageService, NzModalService, UploadXHRArgs} from 'ng-zorro-antd'; import {NzMessageService, NzModalService, UploadXHRArgs} from 'ng-zorro-antd';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
@ -15,7 +15,7 @@ import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
}) })
export class CmsCategoryModuleComponent implements OnInit { export class CmsCategoryModuleComponent implements OnInit {
// 定义表单 // 定义表单
validateForm: FormGroup; validateForm: UntypedFormGroup;
// 搜索按钮等待特效 // 搜索按钮等待特效
isLoadingSearch = false; isLoadingSearch = false;
// 模板名称 // 模板名称
@ -70,7 +70,7 @@ export class CmsCategoryModuleComponent implements OnInit {
this.selectedValueSearch = ''; this.selectedValueSearch = '';
} }
constructor( constructor(
private fb: FormBuilder, private fb: UntypedFormBuilder,
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
private router: Router, private router: Router,

@ -1,5 +1,5 @@
import {Component, OnInit, ViewChild} from '@angular/core'; import {Component, OnInit, ViewChild} from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {NzFormatEmitEvent, NzMessageService, NzModalService, NzTreeComponent, UploadFile} from 'ng-zorro-antd'; import {NzFormatEmitEvent, NzMessageService, NzModalService, NzTreeComponent, UploadFile} from 'ng-zorro-antd';
@ -63,7 +63,7 @@ export class CmsCategoryComponent implements OnInit {
address: '', address: '',
contact: '', contact: '',
}; };
validateForm: FormGroup; validateForm: UntypedFormGroup;
isVisible = false; isVisible = false;
isOkLoading = false; isOkLoading = false;
isOkEditLoading = false; isOkEditLoading = false;
@ -83,7 +83,7 @@ export class CmsCategoryComponent implements OnInit {
private http: HttpClient, private http: HttpClient,
private message: NzMessageService, private message: NzMessageService,
private store: LocalStorageService, private store: LocalStorageService,
private fb: FormBuilder, // 表单 private fb: UntypedFormBuilder, // 表单
private modalService: NzModalService, // 对话框 private modalService: NzModalService, // 对话框
) { ) {
} }

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse} from '@angular/common/http'; import {HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse} from '@angular/common/http';
import {NzMessageService, UploadFile, UploadFilter, UploadXHRArgs} from 'ng-zorro-antd'; import {NzMessageService, UploadFile, UploadFilter, UploadXHRArgs} from 'ng-zorro-antd';
@ -19,7 +19,7 @@ export class CmsContentAddComponent implements OnInit {
// 详情id // 详情id
id; id;
// 定义表单 // 定义表单
validateForm: FormGroup; validateForm: UntypedFormGroup;
// 定义路径 // 定义路径
WEB_SERVE_URL; WEB_SERVE_URL;
// 定义回调路径 // 定义回调路径
@ -41,7 +41,7 @@ export class CmsContentAddComponent implements OnInit {
// 是否有附属信息 // 是否有附属信息
hasPatch = 0; hasPatch = 0;
// 允许上传的文件类型 // 允许上传的文件类型
annexForm: FormGroup; /** 定义附件表单 **/ annexForm: UntypedFormGroup; /** 定义附件表单 **/
isVisible = false; /** 是否弹出添加 **/ isVisible = false; /** 是否弹出添加 **/
fileList = []; fileList = [];
// 上传的后缀名 // 上传的后缀名
@ -129,7 +129,7 @@ export class CmsContentAddComponent implements OnInit {
suffixList = []; suffixList = [];
constructor( constructor(
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private fb: FormBuilder, // 表单 private fb: UntypedFormBuilder, // 表单
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
) { ) {

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse} from '@angular/common/http'; import {HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse} from '@angular/common/http';
import {NzMessageService, NzModalService, UploadXHRArgs} from 'ng-zorro-antd'; import {NzMessageService, NzModalService, UploadXHRArgs} from 'ng-zorro-antd';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
@ -18,7 +18,7 @@ export class CmsContentEditComponent implements OnInit {
id; id;
cmsContentView: any = {}; cmsContentView: any = {};
// 定义表单 // 定义表单
validateForm: FormGroup; validateForm: UntypedFormGroup;
// 定义路径 // 定义路径
WEB_SERVE_URL; WEB_SERVE_URL;
// 定义回调路径 // 定义回调路径
@ -30,7 +30,7 @@ export class CmsContentEditComponent implements OnInit {
listImg = null; listImg = null;
constructor( constructor(
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private fb: FormBuilder, // 表单 private fb: UntypedFormBuilder, // 表单
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
) { ) {

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {NzMessageService} from 'ng-zorro-antd'; import {NzMessageService} from 'ng-zorro-antd';
import {environment} from '../../../../environments/environment'; import {environment} from '../../../../environments/environment';
@ -23,10 +23,10 @@ export class CmsContentViewComponent implements OnInit {
// 根据内容查询附件列表 // 根据内容查询附件列表
patchList = []; patchList = [];
// 定义表单 // 定义表单
validateForm: FormGroup; validateForm: UntypedFormGroup;
constructor( constructor(
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private fb: FormBuilder, // 表单 private fb: UntypedFormBuilder, // 表单
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
) { ) {

@ -1,5 +1,5 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse} from '@angular/common/http'; import {HttpClient, HttpEvent, HttpEventType, HttpRequest, HttpResponse} from '@angular/common/http';
import {NzMessageService, NzModalService, UploadXHRArgs} from 'ng-zorro-antd'; import {NzMessageService, NzModalService, UploadXHRArgs} from 'ng-zorro-antd';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
@ -52,7 +52,7 @@ export class CmsContentComponent implements OnInit {
// 附件返回地址 // 附件返回地址
patchPath = ''; patchPath = '';
// 允许上传的文件类型 // 允许上传的文件类型
annexForm: FormGroup; annexForm: UntypedFormGroup;
/** 定义附件表单 **/ /** 定义附件表单 **/
isVisible = false; isVisible = false;
/** 是否弹出添加 **/ /** 是否弹出添加 **/
@ -143,7 +143,7 @@ export class CmsContentComponent implements OnInit {
isPushOkLoading = false; isPushOkLoading = false;
moduleId = ''; moduleId = '';
pushId = ''; pushId = '';
pushForm: FormGroup; pushForm: UntypedFormGroup;
// 可选择的模板列表 // 可选择的模板列表
selectModule = []; selectModule = [];
/** 按钮数据权限 **/ /** 按钮数据权限 **/
@ -154,7 +154,7 @@ export class CmsContentComponent implements OnInit {
BTN_cmscontent_up_down = 0; BTN_cmscontent_up_down = 0;
constructor( constructor(
private fb: FormBuilder, private fb: UntypedFormBuilder,
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
private router: Router, private router: Router,

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {ValidatorsService} from '../../../services/validators.service'; import {ValidatorsService} from '../../../services/validators.service';
@ -13,11 +13,11 @@ import {CommonsService} from '../../../services/commons.service';
}) })
export class CompanyAddComponent implements OnInit { export class CompanyAddComponent implements OnInit {
companyForm: FormGroup; companyForm: UntypedFormGroup;
btnLoading = false; btnLoading = false;
provinceArray = []; provinceArray = [];
constructor(private form: FormBuilder, constructor(private form: UntypedFormBuilder,
private modal: NzModalService, private modal: NzModalService,
private companyService: CompanyService, private companyService: CompanyService,
private commonsService: CommonsService, private commonsService: CommonsService,

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {CompanyService} from '../../../services/company.service'; import {CompanyService} from '../../../services/company.service';
import {CommonsService} from '../../../services/commons.service'; import {CommonsService} from '../../../services/commons.service';
@ -14,8 +14,8 @@ export class CompanyListComponent implements OnInit {
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
tradeTakeConfigForm: FormGroup; tradeTakeConfigForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
tradeTakeConfigMadel = false; tradeTakeConfigMadel = false;
@ -26,7 +26,7 @@ export class CompanyListComponent implements OnInit {
private companyService: CompanyService, private companyService: CompanyService,
private commonsService: CommonsService, private commonsService: CommonsService,
private tradeTakeConfigService: TradeTakeConfigService, private tradeTakeConfigService: TradeTakeConfigService,
private form: FormBuilder) { } private form: UntypedFormBuilder) { }
ngOnInit(): void { ngOnInit(): void {
this.searchForm = this.form.group({ this.searchForm = this.form.group({

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
import {CompanyService} from '../../../services/company.service'; import {CompanyService} from '../../../services/company.service';
import {CommonsService} from '../../../services/commons.service'; import {CommonsService} from '../../../services/commons.service';
@ -12,14 +12,14 @@ import {ActivatedRoute, Params, Router} from '@angular/router';
}) })
export class CompanyUpdateComponent implements OnInit { export class CompanyUpdateComponent implements OnInit {
companyForm: FormGroup; companyForm: UntypedFormGroup;
btnLoading = false; btnLoading = false;
provinceArray = []; provinceArray = [];
dataObject: any = {}; dataObject: any = {};
constructor(private form: FormBuilder, constructor(private form: UntypedFormBuilder,
private modal: NzModalService, private modal: NzModalService,
private companyService: CompanyService, private companyService: CompanyService,
private commonsService: CommonsService, private commonsService: CommonsService,

@ -5,7 +5,7 @@ import {LocalStorageService} from '../../../services/local-storage.service';
import {environment} from '../../../../environments/environment'; import {environment} from '../../../../environments/environment';
import {AgentService} from '../../../services/agent.service'; import {AgentService} from '../../../services/agent.service';
import {SalesmanService} from '../../../services/salesman.service'; import {SalesmanService} from '../../../services/salesman.service';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {CompanyService} from '../../../services/company.service'; import {CompanyService} from '../../../services/company.service';
import {CommonsService} from '../../../services/commons.service'; import {CommonsService} from '../../../services/commons.service';
@ -28,7 +28,7 @@ export class DeviceListComponent implements OnInit {
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
@ -36,21 +36,21 @@ export class DeviceListComponent implements OnInit {
companyDataArray = []; companyDataArray = [];
allocationCompanyModal = false; allocationCompanyModal = false;
allocationCompanyForm: FormGroup; allocationCompanyForm: UntypedFormGroup;
agentDataArray = []; agentDataArray = [];
allocationAgentModal = false; allocationAgentModal = false;
allocationAgentForm: FormGroup; allocationAgentForm: UntypedFormGroup;
salesmanDataArray = []; salesmanDataArray = [];
allocationSalesmanModal = false; allocationSalesmanModal = false;
allocationSalesmanForm: FormGroup; allocationSalesmanForm: UntypedFormGroup;
importDeviceErrorModal = false; importDeviceErrorModal = false;
importDeviceErrorData = []; importDeviceErrorData = [];
importDeviceModal = false; importDeviceModal = false;
importDeviceForm: FormGroup; importDeviceForm: UntypedFormGroup;
deviceTypeArray = []; deviceTypeArray = [];
BTN_IMPORT_DEVICE = false; BTN_IMPORT_DEVICE = false;
@ -72,7 +72,7 @@ export class DeviceListComponent implements OnInit {
private agentService: AgentService, private agentService: AgentService,
private deviceService: DeviceService, private deviceService: DeviceService,
private store: LocalStorageService, private store: LocalStorageService,
private form: FormBuilder) { private form: UntypedFormBuilder) {
this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType; this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType;
} }

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {CommonsService} from '../../../services/commons.service'; import {CommonsService} from '../../../services/commons.service';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {DeviceOrderService} from '../../../services/device-order.service'; import {DeviceOrderService} from '../../../services/device-order.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {environment} from '../../../../environments/environment'; import {environment} from '../../../../environments/environment';
@ -25,7 +25,7 @@ export class DeviceOrderListComponent implements OnInit {
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
isCollapse = false; isCollapse = false;
@ -40,7 +40,7 @@ export class DeviceOrderListComponent implements OnInit {
private commonsService: CommonsService, private commonsService: CommonsService,
private deviceOrderService: DeviceOrderService, private deviceOrderService: DeviceOrderService,
private store: LocalStorageService, private store: LocalStorageService,
private form: FormBuilder) { } private form: UntypedFormBuilder) { }
ngOnInit(): void { ngOnInit(): void {
this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType; this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType;

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {LoginService} from '../../../services/login.service'; import {LoginService} from '../../../services/login.service';
import {ADMIN_INFO_OBJECT, INIT_FLAG, ROLE_TYPE, TOKEN} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT, INIT_FLAG, ROLE_TYPE, TOKEN} from '../../../services/local-storage.namespace';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
@ -14,11 +14,11 @@ import {NzModalService} from 'ng-zorro-antd';
}) })
export class AdminLoginComponent implements OnInit { export class AdminLoginComponent implements OnInit {
loginForm: FormGroup; // 登录表单 loginForm: UntypedFormGroup; // 登录表单
constructor(private store: LocalStorageService, // 数据请求 constructor(private store: LocalStorageService, // 数据请求
private router: Router, // 路由 private router: Router, // 路由
private form: FormBuilder, // 表单校验 private form: UntypedFormBuilder, // 表单校验
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private loginService: LoginService, private loginService: LoginService,
private modal: NzModalService) { private modal: NzModalService) {

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {LoginService} from '../../../services/login.service'; import {LoginService} from '../../../services/login.service';
import {ADMIN_INFO_OBJECT, INIT_FLAG, ROLE_TYPE, TOKEN} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT, INIT_FLAG, ROLE_TYPE, TOKEN} from '../../../services/local-storage.namespace';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
@ -14,11 +14,11 @@ import {NzModalService} from 'ng-zorro-antd';
}) })
export class AgentLoginComponent implements OnInit { export class AgentLoginComponent implements OnInit {
loginForm: FormGroup; // 登录表单 loginForm: UntypedFormGroup; // 登录表单
constructor(private store: LocalStorageService, // 数据请求 constructor(private store: LocalStorageService, // 数据请求
private router: Router, // 路由 private router: Router, // 路由
private form: FormBuilder, // 表单校验 private form: UntypedFormBuilder, // 表单校验
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private loginService: LoginService, private loginService: LoginService,
private modal: NzModalService) { private modal: NzModalService) {

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {LoginService} from '../../../services/login.service'; import {LoginService} from '../../../services/login.service';
import {ADMIN_INFO_OBJECT, INIT_FLAG, ROLE_TYPE, TOKEN} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT, INIT_FLAG, ROLE_TYPE, TOKEN} from '../../../services/local-storage.namespace';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
@ -14,11 +14,11 @@ import {NzModalService} from 'ng-zorro-antd';
}) })
export class LoginComponent implements OnInit { export class LoginComponent implements OnInit {
loginForm: FormGroup; // 登录表单 loginForm: UntypedFormGroup; // 登录表单
constructor(private store: LocalStorageService, // 数据请求 constructor(private store: LocalStorageService, // 数据请求
private router: Router, // 路由 private router: Router, // 路由
private form: FormBuilder, // 表单校验 private form: UntypedFormBuilder, // 表单校验
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private loginService: LoginService, private loginService: LoginService,
private modal: NzModalService) { private modal: NzModalService) {

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {LoginService} from '../../../services/login.service'; import {LoginService} from '../../../services/login.service';
import {ADMIN_INFO_OBJECT, INIT_FLAG, ROLE_TYPE, TOKEN} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT, INIT_FLAG, ROLE_TYPE, TOKEN} from '../../../services/local-storage.namespace';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
@ -14,11 +14,11 @@ import {NzModalService} from 'ng-zorro-antd';
}) })
export class SalesmanLoginComponent implements OnInit { export class SalesmanLoginComponent implements OnInit {
loginForm: FormGroup; // 登录表单 loginForm: UntypedFormGroup; // 登录表单
constructor(private store: LocalStorageService, // 数据请求 constructor(private store: LocalStorageService, // 数据请求
private router: Router, // 路由 private router: Router, // 路由
private form: FormBuilder, // 表单校验 private form: UntypedFormBuilder, // 表单校验
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private loginService: LoginService, private loginService: LoginService,
private modal: NzModalService) { private modal: NzModalService) {

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {MerService} from '../../../services/mer.service'; import {MerService} from '../../../services/mer.service';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {MerPlatformService} from '../../../services/mer-platform.service'; import {MerPlatformService} from '../../../services/mer-platform.service';
import {environment} from '../../../../environments/environment'; import {environment} from '../../../../environments/environment';
import {NzMessageService, NzModalService, NzUploadFile} from "ng-zorro-antd"; import {NzMessageService, NzModalService, NzUploadFile} from "ng-zorro-antd";
@ -21,11 +21,11 @@ export class MerListComponent implements OnInit {
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
ccbConfigForm: FormGroup; ccbConfigForm: UntypedFormGroup;
ccbFileArray: NzUploadFile[] = []; ccbFileArray: NzUploadFile[] = [];
salesmanArray = []; salesmanArray = [];
@ -34,7 +34,7 @@ export class MerListComponent implements OnInit {
checkedData = []; checkedData = [];
merMigrateSalesmanModal = false; merMigrateSalesmanModal = false;
merMigrateSalesmanForm: FormGroup; merMigrateSalesmanForm: UntypedFormGroup;
constructor(private modal: NzModalService, constructor(private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
@ -42,7 +42,7 @@ export class MerListComponent implements OnInit {
private merPlatformService: MerPlatformService, private merPlatformService: MerPlatformService,
private salesmanService: SalesmanService, private salesmanService: SalesmanService,
private store: LocalStorageService, private store: LocalStorageService,
private form: FormBuilder) { private form: UntypedFormBuilder) {
this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType; this.roleType = this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType;
} }

@ -15,7 +15,7 @@ import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
import {IconService} from '../../services/icon.service'; import {IconService} from '../../services/icon.service';
import {CommonsService} from '../../services/commons.service'; import {CommonsService} from '../../services/commons.service';
import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from '@angular/forms';
import {ValidatorsService} from '../../services/validators.service'; import {ValidatorsService} from '../../services/validators.service';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import {Md5} from 'ts-md5'; import {Md5} from 'ts-md5';
@ -28,7 +28,7 @@ import {environment} from '../../../environments/environment';
}) })
export class NavigationComponent implements OnInit { export class NavigationComponent implements OnInit {
visibleUpdatePwd = false; // 修改密码抽屉 visibleUpdatePwd = false; // 修改密码抽屉
validateForm: FormGroup; // 定义表单 validateForm: UntypedFormGroup; // 定义表单
passwordVisible = false; passwordVisible = false;
isCollapsed = false; isCollapsed = false;
@ -44,7 +44,7 @@ export class NavigationComponent implements OnInit {
private iconService: IconService, private iconService: IconService,
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private modal: NzModalService, private modal: NzModalService,
private fb: FormBuilder, // 表单 private fb: UntypedFormBuilder, // 表单
private router: Router, private router: Router,
) { } ) { }
@ -178,7 +178,7 @@ export class NavigationComponent implements OnInit {
* *
* @param control * @param control
*/ */
checkPwd = (control: FormControl): { [s: string]: boolean } => { checkPwd = (control: UntypedFormControl): { [s: string]: boolean } => {
if (!control.value) { if (!control.value) {
return { required: true }; return { required: true };
} else if (control.value !== this.validateForm.controls.newPassword.value) { } else if (control.value !== this.validateForm.controls.newPassword.value) {

@ -5,7 +5,7 @@ import {AgentService} from '../../../services/agent.service';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {PayQrCodeService} from '../../../services/pay-qr-code.service'; import {PayQrCodeService} from '../../../services/pay-qr-code.service';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {CompanyService} from '../../../services/company.service'; import {CompanyService} from '../../../services/company.service';
@ -27,7 +27,7 @@ export class PayQrCodeListComponent implements OnInit {
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
@ -35,19 +35,19 @@ export class PayQrCodeListComponent implements OnInit {
checkedData = []; checkedData = [];
generatePayQrCodeModal = false; generatePayQrCodeModal = false;
generatePayQrCodeForm: FormGroup; generatePayQrCodeForm: UntypedFormGroup;
companyDataArray = []; companyDataArray = [];
allocationCompanyModal = false; allocationCompanyModal = false;
allocationCompanyForm: FormGroup; allocationCompanyForm: UntypedFormGroup;
agentDataArray = []; agentDataArray = [];
allocationAgentModal = false; allocationAgentModal = false;
allocationAgentForm: FormGroup; allocationAgentForm: UntypedFormGroup;
salesmanDataArray = []; salesmanDataArray = [];
allocationSalesmanModal = false; allocationSalesmanModal = false;
allocationSalesmanForm: FormGroup; allocationSalesmanForm: UntypedFormGroup;
BTN_QRCODE_GENERATE = false; BTN_QRCODE_GENERATE = false;
BTN_QRCODE_COMPANY = false; BTN_QRCODE_COMPANY = false;
@ -64,7 +64,7 @@ export class PayQrCodeListComponent implements OnInit {
private salesmanService: SalesmanService, private salesmanService: SalesmanService,
private payQrCodeService: PayQrCodeService, private payQrCodeService: PayQrCodeService,
private store: LocalStorageService, private store: LocalStorageService,
private form: FormBuilder) { private form: UntypedFormBuilder) {
this.userType = Number(this.store.get(ADMIN_INFO_OBJECT)['secUser']['objectType']); this.userType = Number(this.store.get(ADMIN_INFO_OBJECT)['secUser']['objectType']);
} }

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {PlatformService} from '../../../services/platform.service'; import {PlatformService} from '../../../services/platform.service';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
@Component({ @Component({
@ -14,15 +14,15 @@ export class PlatformListComponent implements OnInit {
dataArray = []; dataArray = [];
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
platformForm: FormGroup; platformForm: UntypedFormGroup;
constructor(private modal: NzModalService, constructor(private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
private form: FormBuilder, private form: UntypedFormBuilder,
private platformService: PlatformService) { } private platformService: PlatformService) { }
ngOnInit(): void { ngOnInit(): void {

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {ValidatorsService} from '../../../services/validators.service'; import {ValidatorsService} from '../../../services/validators.service';
import {SalesmanService} from '../../../services/salesman.service'; import {SalesmanService} from '../../../services/salesman.service';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
@ -12,10 +12,10 @@ import {ActivatedRoute, Router} from '@angular/router';
}) })
export class SalesmanAddComponent implements OnInit { export class SalesmanAddComponent implements OnInit {
salesmanForm: FormGroup; salesmanForm: UntypedFormGroup;
btnLoading = false; btnLoading = false;
constructor(private form: FormBuilder, constructor(private form: UntypedFormBuilder,
private modal: NzModalService, private modal: NzModalService,
private salesmanService: SalesmanService, private salesmanService: SalesmanService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {SalesmanService} from '../../../services/salesman.service'; import {SalesmanService} from '../../../services/salesman.service';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
@ -16,7 +16,7 @@ export class SalesmanListComponent implements OnInit {
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
@ -30,7 +30,7 @@ export class SalesmanListComponent implements OnInit {
private agentService: AgentService, private agentService: AgentService,
private companyService: CompanyService, private companyService: CompanyService,
private localStorageService: LocalStorageService, private localStorageService: LocalStorageService,
private form: FormBuilder) { private form: UntypedFormBuilder) {
this.userObjectType = Number(this.localStorageService.get(ADMIN_INFO_OBJECT)['secUser']['objectType']); this.userObjectType = Number(this.localStorageService.get(ADMIN_INFO_OBJECT)['secUser']['objectType']);
} }

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {SalesmanService} from '../../../services/salesman.service'; import {SalesmanService} from '../../../services/salesman.service';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute, Params, Router} from '@angular/router'; import {ActivatedRoute, Params, Router} from '@angular/router';
@ -11,7 +11,7 @@ import {ActivatedRoute, Params, Router} from '@angular/router';
}) })
export class SalesmanUpdateComponent implements OnInit { export class SalesmanUpdateComponent implements OnInit {
salesmanForm: FormGroup; salesmanForm: UntypedFormGroup;
btnLoading = false; btnLoading = false;
dataObject: any = { dataObject: any = {
@ -20,7 +20,7 @@ export class SalesmanUpdateComponent implements OnInit {
} }
}; };
constructor(private form: FormBuilder, constructor(private form: UntypedFormBuilder,
private modal: NzModalService, private modal: NzModalService,
private salesmanService: SalesmanService, private salesmanService: SalesmanService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {StoreDeviceService} from '../../../services/store-device.service'; import {StoreDeviceService} from '../../../services/store-device.service';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
@ -15,11 +15,11 @@ export class StoreDeviceListComponent implements OnInit {
dataObject: any = {}; dataObject: any = {};
storeId: number; storeId: number;
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
addForm: FormGroup; addForm: UntypedFormGroup;
addModal = false; addModal = false;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
@ -27,7 +27,7 @@ export class StoreDeviceListComponent implements OnInit {
private modal: NzModalService, private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
private storeDeviceService: StoreDeviceService, private storeDeviceService: StoreDeviceService,
private form: FormBuilder) { } private form: UntypedFormBuilder) { }
ngOnInit(): void { ngOnInit(): void {
this.activatedRoute.queryParams.subscribe(queryParams => { this.activatedRoute.queryParams.subscribe(queryParams => {

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzModalService} from 'ng-zorro-antd'; import {NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {StoreDiscountActivityService} from '../../../services/store-discount-activity.service'; import {StoreDiscountActivityService} from '../../../services/store-discount-activity.service';
@ -14,14 +14,14 @@ import {CommonsService} from '../../../services/commons.service';
}) })
export class StoreDiscountActivityEditComponent implements OnInit { export class StoreDiscountActivityEditComponent implements OnInit {
dataForm: FormGroup; dataForm: UntypedFormGroup;
btnLoading = false; btnLoading = false;
storeArray = []; storeArray = [];
merArray = []; merArray = [];
discountActivityPartakeWayArray = []; discountActivityPartakeWayArray = [];
constructor(private form: FormBuilder, constructor(private form: UntypedFormBuilder,
private modal: NzModalService, private modal: NzModalService,
private commonsService: CommonsService, private commonsService: CommonsService,
private storeDiscountActivityService: StoreDiscountActivityService, private storeDiscountActivityService: StoreDiscountActivityService,

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
@ -14,7 +14,7 @@ export class StoreDiscountActivityListComponent implements OnInit {
dataObject: any = {}; dataObject: any = {};
storeId: number; storeId: number;
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
@ -27,7 +27,7 @@ export class StoreDiscountActivityListComponent implements OnInit {
private modal: NzModalService, private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
private storeDiscountActivityService: StoreDiscountActivityService, private storeDiscountActivityService: StoreDiscountActivityService,
private form: FormBuilder) { } private form: UntypedFormBuilder) { }
ngOnInit(): void { ngOnInit(): void {
this.BTN_STORE_DISCOUNT_ACTIVITY_ADD = this.store.isBtnCompetence('BTN_STORE_DISCOUNT_ACTIVITY_ADD'); // 增加按钮权限 this.BTN_STORE_DISCOUNT_ACTIVITY_ADD = this.store.isBtnCompetence('BTN_STORE_DISCOUNT_ACTIVITY_ADD'); // 增加按钮权限

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {StoreService} from '../../../services/store.service'; import {StoreService} from '../../../services/store.service';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute, Params} from '@angular/router'; import {ActivatedRoute, Params} from '@angular/router';
@ -15,7 +15,7 @@ export class StoreListComponent implements OnInit {
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
@ -24,7 +24,7 @@ export class StoreListComponent implements OnInit {
private message: NzMessageService, private message: NzMessageService,
private storeService: StoreService, private storeService: StoreService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private form: FormBuilder) { } private form: UntypedFormBuilder) { }
ngOnInit(): void { ngOnInit(): void {
this.searchForm = this.form.group({ this.searchForm = this.form.group({

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {SystemService} from '../../../services/system.service'; import {SystemService} from '../../../services/system.service';
@ -55,15 +55,15 @@ export class MenuComponent implements OnInit {
parentId: null, parentId: null,
}; };
checkedMenu = []; checkedMenu = [];
validateFormQuery: FormGroup; validateFormQuery: UntypedFormGroup;
validateFormEdit: FormGroup; validateFormEdit: UntypedFormGroup;
loadingSearch = false; // 加载菜单树 loadingSearch = false; // 加载菜单树
loadingSearchDetail = false; // 加载菜单详情 loadingSearchDetail = false; // 加载菜单详情
loadingImg = false; // 图片上传 loadingImg = false; // 图片上传
pcMenu = true; // PC手机菜单切换 true-PC菜单 false-手机菜单 pcMenu = true; // PC手机菜单切换 true-PC菜单 false-手机菜单
constructor( constructor(
private fb: FormBuilder, private fb: UntypedFormBuilder,
private message: NzMessageService, private message: NzMessageService,
private http: HttpClient, private http: HttpClient,
private systemService: SystemService, private systemService: SystemService,

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {NzIconService, NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzIconService, NzMessageService, NzModalService} from 'ng-zorro-antd';
import {Router} from '@angular/router'; import {Router} from '@angular/router';
@ -27,7 +27,7 @@ export class PermissionComponent implements OnInit {
buttonList; // 按钮权限列表 buttonList; // 按钮权限列表
FILE_URL = environment.imageUrl; FILE_URL = environment.imageUrl;
/* 页面元素 */ /* 页面元素 */
validateForm: FormGroup; validateForm: UntypedFormGroup;
isLoadingSearch = false; isLoadingSearch = false;
loading = true; loading = true;
@ -36,7 +36,7 @@ export class PermissionComponent implements OnInit {
} }
constructor( constructor(
private fb: FormBuilder, private fb: UntypedFormBuilder,
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
private router: Router, private router: Router,

@ -3,7 +3,7 @@ import {HttpClient} from '@angular/common/http';
import {NzMessageService, NzModalService, UploadFile} from 'ng-zorro-antd'; import {NzMessageService, NzModalService, UploadFile} from 'ng-zorro-antd';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {PlatformLocation} from '@angular/common'; import {PlatformLocation} from '@angular/common';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import { NzFormatEmitEvent } from 'ng-zorro-antd'; import { NzFormatEmitEvent } from 'ng-zorro-antd';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {ValidatorsService} from '../../../services/validators.service'; import {ValidatorsService} from '../../../services/validators.service';
@ -23,7 +23,7 @@ export class SystemOrganizationComponent implements OnInit {
organizationArr: any = {}; organizationArr: any = {};
remark; remark;
isVisible = false; isVisible = false;
validateForm: FormGroup; validateForm: UntypedFormGroup;
isOkLoading = false; isOkLoading = false;
isOkEditLoading = false; isOkEditLoading = false;
province; province;
@ -54,7 +54,7 @@ export class SystemOrganizationComponent implements OnInit {
licenseImgShow: string | undefined = ''; licenseImgShow: string | undefined = '';
licenseImgVisibleShow = false; licenseImgVisibleShow = false;
organizationAgencyForm: FormGroup; organizationAgencyForm: UntypedFormGroup;
showUploadList = { showUploadList = {
@ -87,7 +87,7 @@ export class SystemOrganizationComponent implements OnInit {
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
private location: PlatformLocation, private location: PlatformLocation,
private store: LocalStorageService , private store: LocalStorageService ,
private fb: FormBuilder, // 表单 private fb: UntypedFormBuilder, // 表单
private modalService: NzModalService, // 对话框 private modalService: NzModalService, // 对话框
) { ) {
} }

@ -4,7 +4,7 @@ import {Component, OnInit} from '@angular/core';
import {PlatformLocation} from '@angular/common'; import {PlatformLocation} from '@angular/common';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {NzFormatEmitEvent, NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzFormatEmitEvent, NzMessageService, NzModalService} from 'ng-zorro-antd';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, FormGroup, Validators} from '@angular/forms';
import {ActivatedRoute} from '@angular/router'; import {ActivatedRoute} from '@angular/router';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
@ -40,7 +40,7 @@ export class SystemRoleShowComponent implements OnInit {
private location: PlatformLocation, // 路径 private location: PlatformLocation, // 路径
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
private fb: FormBuilder, // 表单 private fb: UntypedFormBuilder, // 表单
private modalService: NzModalService, // 对话框 private modalService: NzModalService, // 对话框
private store: LocalStorageService , private store: LocalStorageService ,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,

@ -3,7 +3,7 @@ import {Component, OnInit} from '@angular/core';
import {PlatformLocation} from '@angular/common'; import {PlatformLocation} from '@angular/common';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {NzFormatEmitEvent, NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzFormatEmitEvent, NzMessageService, NzModalService} from 'ng-zorro-antd';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {NavigationExtras, Router} from '@angular/router'; import {NavigationExtras, Router} from '@angular/router';
// import {DictionaryService} from '../../../services/dictionary/dictionary.service'; // import {DictionaryService} from '../../../services/dictionary/dictionary.service';
@ -29,8 +29,8 @@ export class SystemRoleComponent implements OnInit {
isVisible = false; isVisible = false;
isVisibleEdit = false; isVisibleEdit = false;
isOkLoading = false; isOkLoading = false;
validateForm: FormGroup; validateForm: UntypedFormGroup;
validateFormEdit: FormGroup; validateFormEdit: UntypedFormGroup;
title = ''; title = '';
role: any = { role: any = {
companyId: '', companyId: '',
@ -65,7 +65,7 @@ export class SystemRoleComponent implements OnInit {
private location: PlatformLocation, // 路径 private location: PlatformLocation, // 路径
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
private fb: FormBuilder, // 表单 private fb: UntypedFormBuilder, // 表单
private modalService: NzModalService, // 对话框 private modalService: NzModalService, // 对话框
private commonsService: CommonsService, private commonsService: CommonsService,
private store: LocalStorageService , private store: LocalStorageService ,

@ -4,7 +4,7 @@ import {Component, OnInit} from '@angular/core';
import {PlatformLocation} from '@angular/common'; import {PlatformLocation} from '@angular/common';
import {HttpClient} from '@angular/common/http'; import {HttpClient} from '@angular/common/http';
import {NzMessageService, NzModalService, NzUploadFile} from 'ng-zorro-antd'; import {NzMessageService, NzModalService, NzUploadFile} from 'ng-zorro-antd';
import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormControl, UntypedFormGroup, Validators} from '@angular/forms';
import {Observable, Observer} from 'rxjs'; import {Observable, Observer} from 'rxjs';
import {ValidatorsService} from '../../../services/validators.service'; import {ValidatorsService} from '../../../services/validators.service';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
@ -29,7 +29,7 @@ export class SystemUserComponent implements OnInit {
isVisible = false; isVisible = false;
isVisibleEdit = false; isVisibleEdit = false;
isOkLoading = false; isOkLoading = false;
validateForm: FormGroup; validateForm: UntypedFormGroup;
WEB_SERVE_URL = environment.baseUrl; WEB_SERVE_URL = environment.baseUrl;
title: any = ''; title: any = '';
isSpinning = false; isSpinning = false;
@ -56,7 +56,7 @@ export class SystemUserComponent implements OnInit {
private location: PlatformLocation, // 路径 private location: PlatformLocation, // 路径
private http: HttpClient, // http请求 private http: HttpClient, // http请求
private message: NzMessageService, // 信息提示 private message: NzMessageService, // 信息提示
private fb: FormBuilder, // 表单 private fb: UntypedFormBuilder, // 表单
private modalService: NzModalService, // 对话框 private modalService: NzModalService, // 对话框
private getData: LocalStorageService, // 请求数据字典查询 private getData: LocalStorageService, // 请求数据字典查询
private store: LocalStorageService, private store: LocalStorageService,
@ -95,7 +95,7 @@ export class SystemUserComponent implements OnInit {
} }
confirmationValidator = (control: FormControl): { [s: string]: boolean } => { confirmationValidator = (control: UntypedFormControl): { [s: string]: boolean } => {
if (!control.value) { if (!control.value) {
return {required: true}; return {required: true};
} else if (control.value !== this.validateForm.controls.password.value) { } else if (control.value !== this.validateForm.controls.password.value) {

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment'; import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup, Validators} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {NzMessageService, NzModalService, NzUploadFile} from 'ng-zorro-antd'; import {NzMessageService, NzModalService, NzUploadFile} from 'ng-zorro-antd';
import {StoreService} from '../../../services/store.service'; import {StoreService} from '../../../services/store.service';
@ -17,7 +17,7 @@ export class VersionComponent implements OnInit {
loading = false; loading = false;
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
loadingObject = { loadingObject = {
@ -44,14 +44,14 @@ export class VersionComponent implements OnInit {
versionDetailModal = false; versionDetailModal = false;
versionDetailObject: any = {}; versionDetailObject: any = {};
editVersionModal = false; editVersionModal = false;
editVersionModalForm: FormGroup; editVersionModalForm: UntypedFormGroup;
versionFileUrl; versionFileUrl;
constructor(private store: LocalStorageService, // 数据请求 constructor(private store: LocalStorageService, // 数据请求
private modal: NzModalService, private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
private systemVersionService: SystemVersionService, private systemVersionService: SystemVersionService,
private storeService: StoreService, private storeService: StoreService,
private form: FormBuilder) { } private form: UntypedFormBuilder) { }
ngOnInit(): void { ngOnInit(): void {
this.searchForm = this.form.group({ this.searchForm = this.form.group({

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {PlatformService} from '../../../services/platform.service'; import {PlatformService} from '../../../services/platform.service';
import {MerService} from '../../../services/mer.service'; import {MerService} from '../../../services/mer.service';
@ -16,7 +16,7 @@ import {LocalStorageService} from '../../../services/local-storage.service';
}) })
export class TradeCheckingDetailComponent implements OnInit { export class TradeCheckingDetailComponent implements OnInit {
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum = 1; pageNum = 1;
pageSize = 10; pageSize = 10;
whereObject: any = {}; whereObject: any = {};
@ -41,7 +41,7 @@ export class TradeCheckingDetailComponent implements OnInit {
roleType: number; roleType: number;
constructor(private modal: NzModalService, constructor(private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
private form: FormBuilder, private form: UntypedFormBuilder,
private platformService: PlatformService, private platformService: PlatformService,
private localStorage: LocalStorageService, private localStorage: LocalStorageService,
private merService: MerService, private merService: MerService,

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {PlatformService} from '../../../services/platform.service'; import {PlatformService} from '../../../services/platform.service';
import {TradeCheckingService} from '../../../services/trade-checking.service'; import {TradeCheckingService} from '../../../services/trade-checking.service';
@ -15,7 +15,7 @@ import {LocalStorageService} from '../../../services/local-storage.service';
}) })
export class TradeCheckingComponent implements OnInit { export class TradeCheckingComponent implements OnInit {
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
loadingObject = { loadingObject = {
@ -35,7 +35,7 @@ export class TradeCheckingComponent implements OnInit {
roleType: number; roleType: number;
constructor(private modal: NzModalService, constructor(private modal: NzModalService,
private message: NzMessageService, private message: NzMessageService,
private form: FormBuilder, private form: UntypedFormBuilder,
private platformService: PlatformService, private platformService: PlatformService,
private localStorage: LocalStorageService, private localStorage: LocalStorageService,
private merService: MerService, private merService: MerService,

@ -3,7 +3,7 @@ import {TradeOrderService} from '../../../services/trade-order.service';
import {LocalStorageService} from '../../../services/local-storage.service'; import {LocalStorageService} from '../../../services/local-storage.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {StoreService} from '../../../services/store.service'; import {StoreService} from '../../../services/store.service';
import {FormBuilder, FormGroup} from '@angular/forms'; import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd'; import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {environment} from '../../../../environments/environment'; import {environment} from '../../../../environments/environment';
@ -17,7 +17,7 @@ export class TradeOrderListComponent implements OnInit {
loading = false; loading = false;
dataObject: any = {}; dataObject: any = {};
tableLoading = true; tableLoading = true;
searchForm: FormGroup; searchForm: UntypedFormGroup;
pageNum: number; pageNum: number;
whereObject: any = {}; whereObject: any = {};
userObjectType: number; userObjectType: number;
@ -35,7 +35,7 @@ export class TradeOrderListComponent implements OnInit {
private message: NzMessageService, private message: NzMessageService,
private tradeOrderService: TradeOrderService, private tradeOrderService: TradeOrderService,
private storeService: StoreService, private storeService: StoreService,
private form: FormBuilder) { } private form: UntypedFormBuilder) { }
ngOnInit(): void { ngOnInit(): void {
this.userObjectType = this.store.get(ADMIN_INFO_OBJECT)['secUser']['objectType']; this.userObjectType = this.store.get(ADMIN_INFO_OBJECT)['secUser']['objectType'];

@ -10,7 +10,7 @@
"module": "es2020", "module": "es2020",
"moduleResolution": "node", "moduleResolution": "node",
"importHelpers": true, "importHelpers": true,
"target": "es2015", "target": "es2020",
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"
], ],

Loading…
Cancel
Save