Compare commits

...

15 Commits
master ... dev

  1. 0
      .browserslistrc
  2. 1
      .gitignore
  3. 35
      angular.json
  4. 2
      e2e/tsconfig.json
  5. 21170
      package-lock.json
  6. 46
      package.json
  7. 21
      src/app/admin/activity-money/activity-money-routing.module.ts
  8. 30
      src/app/admin/activity-money/activity-money.module.ts
  9. 152
      src/app/admin/activity-money/merchant-allocation/merchant-allocation.component.html
  10. 6
      src/app/admin/activity-money/merchant-allocation/merchant-allocation.component.scss
  11. 28
      src/app/admin/activity-money/merchant-allocation/merchant-allocation.component.spec.ts
  12. 229
      src/app/admin/activity-money/merchant-allocation/merchant-allocation.component.ts
  13. 64
      src/app/admin/activity-money/prize-pool-detail/prize-pool-detail.component.html
  14. 4
      src/app/admin/activity-money/prize-pool-detail/prize-pool-detail.component.scss
  15. 28
      src/app/admin/activity-money/prize-pool-detail/prize-pool-detail.component.spec.ts
  16. 70
      src/app/admin/activity-money/prize-pool-detail/prize-pool-detail.component.ts
  17. 93
      src/app/admin/activity-money/prize-pool/prize-pool.component.html
  18. 0
      src/app/admin/activity-money/prize-pool/prize-pool.component.scss
  19. 28
      src/app/admin/activity-money/prize-pool/prize-pool.component.spec.ts
  20. 100
      src/app/admin/activity-money/prize-pool/prize-pool.component.ts
  21. 6
      src/app/admin/agent/agent-add/agent-add.component.ts
  22. 8
      src/app/admin/agent/agent-list/agent-list.component.ts
  23. 6
      src/app/admin/agent/agent-update/agent-update.component.ts
  24. 6
      src/app/admin/cms/cms-category-module/cms-category-module.component.ts
  25. 6
      src/app/admin/cms/cms-category/cms-category.component.ts
  26. 8
      src/app/admin/cms/cms-content-add/cms-content-add.component.ts
  27. 6
      src/app/admin/cms/cms-content-edit/cms-content-edit.component.ts
  28. 6
      src/app/admin/cms/cms-content-view/cms-content-view.component.ts
  29. 8
      src/app/admin/cms/cms-content/cms-content.component.ts
  30. 6
      src/app/admin/company/company-add/company-add.component.ts
  31. 8
      src/app/admin/company/company-list/company-list.component.ts
  32. 6
      src/app/admin/company/company-update/company-update.component.ts
  33. 14
      src/app/admin/device/device-list/device-list.component.ts
  34. 6
      src/app/admin/device/device-order-list/device-order-list.component.ts
  35. 6
      src/app/admin/login/admin-login/admin-login.component.ts
  36. 6
      src/app/admin/login/agent-login/agent-login.component.ts
  37. 6
      src/app/admin/login/login/login.component.ts
  38. 6
      src/app/admin/login/salesman-login/salesman-login.component.ts
  39. 10
      src/app/admin/mer/mer-list/mer-list.component.ts
  40. 8
      src/app/admin/navigation/navigation.component.ts
  41. 14
      src/app/admin/pay-qr-code/pay-qr-code-list/pay-qr-code-list.component.ts
  42. 8
      src/app/admin/platform/platform-list/platform-list.component.ts
  43. 6
      src/app/admin/salesman/salesman-add/salesman-add.component.ts
  44. 6
      src/app/admin/salesman/salesman-list/salesman-list.component.ts
  45. 6
      src/app/admin/salesman/salesman-update/salesman-update.component.ts
  46. 8
      src/app/admin/store-device/store-device-list/store-device-list.component.ts
  47. 6
      src/app/admin/store-discount-activity/store-discount-activity-edit/store-discount-activity-edit.component.ts
  48. 6
      src/app/admin/store-discount-activity/store-discount-activity-list/store-discount-activity-list.component.ts
  49. 6
      src/app/admin/store/store-list/store-list.component.ts
  50. 8
      src/app/admin/system/menu/menu.component.ts
  51. 6
      src/app/admin/system/permission/permission.component.ts
  52. 8
      src/app/admin/system/system-organization/system-organization.component.ts
  53. 4
      src/app/admin/system/system-role-show/system-role-show.component.ts
  54. 8
      src/app/admin/system/system-role/system-role.component.ts
  55. 8
      src/app/admin/system/system-user/system-user.component.ts
  56. 8
      src/app/admin/system/version/version.component.ts
  57. 2
      src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.html
  58. 6
      src/app/admin/trade-checking/trade-checking-detail/trade-checking-detail.component.ts
  59. 6
      src/app/admin/trade-checking/trade-checking/trade-checking.component.ts
  60. 6
      src/app/admin/trade-order/trade-order-list/trade-order-list.component.ts
  61. 17
      src/app/app-common.module.ts
  62. 5
      src/app/app-routing.module.ts
  63. 41
      src/app/pipes/activity-money/activity-money.pipe.ts
  64. 4
      src/app/pipes/device/device-type.pipe.ts
  65. 1
      src/app/pipes/index.ts
  66. 4
      src/app/pipes/trade-order/pay-mode.pipe.ts
  67. 121
      src/app/services/activity-money.service.ts
  68. 4
      src/app/services/init-guard.service.ts
  69. 2
      src/environments/environment.ts
  70. 12
      src/polyfills.ts
  71. 17
      src/test.ts
  72. 7
      tsconfig.json
  73. 59
      tslint.json

1
.gitignore vendored

@ -1,3 +1,4 @@
/.angular/cache
.idea .idea
node_modules/ node_modules/

@ -22,7 +22,6 @@
"main": "src/main.ts", "main": "src/main.ts",
"polyfills": "src/polyfills.ts", "polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json", "tsConfig": "tsconfig.app.json",
"aot": true,
"assets": [ "assets": [
"src/favicon.ico", "src/favicon.ico",
"src/assets", "src/assets",
@ -39,7 +38,13 @@
"scripts": [ "scripts": [
"./node_modules/jquery/dist/jquery.js", "./node_modules/jquery/dist/jquery.js",
"./src/assets/js/bootstrap-treeview.min.js" "./src/assets/js/bootstrap-treeview.min.js"
] ],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
}, },
"configurations": { "configurations": {
"prod": { "prod": {
@ -52,7 +57,6 @@
"optimization": true, "optimization": true,
"outputHashing": "all", "outputHashing": "all",
"sourceMap": false, "sourceMap": false,
"extractCss": true,
"namedChunks": false, "namedChunks": false,
"extractLicenses": true, "extractLicenses": true,
"vendorChunk": false, "vendorChunk": false,
@ -80,7 +84,6 @@
"optimization": true, "optimization": true,
"outputHashing": "all", "outputHashing": "all",
"sourceMap": false, "sourceMap": false,
"extractCss": true,
"namedChunks": false, "namedChunks": false,
"extractLicenses": true, "extractLicenses": true,
"vendorChunk": false, "vendorChunk": false,
@ -108,7 +111,6 @@
"optimization": true, "optimization": true,
"outputHashing": "all", "outputHashing": "all",
"sourceMap": false, "sourceMap": false,
"extractCss": true,
"namedChunks": false, "namedChunks": false,
"extractLicenses": true, "extractLicenses": true,
"vendorChunk": false, "vendorChunk": false,
@ -126,23 +128,24 @@
} }
] ]
} }
} },
"defaultConfiguration": ""
}, },
"serve": { "serve": {
"builder": "@angular-devkit/build-angular:dev-server", "builder": "@angular-devkit/build-angular:dev-server",
"options": { "options": {
"browserTarget": "gratia-pay-web:build" "buildTarget": "gratia-pay-web:build"
}, },
"configurations": { "configurations": {
"production": { "production": {
"browserTarget": "gratia-pay-web:build:production" "buildTarget": "gratia-pay-web:build:production"
} }
} }
}, },
"extract-i18n": { "extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n", "builder": "@angular-devkit/build-angular:extract-i18n",
"options": { "options": {
"browserTarget": "gratia-pay-web:build" "buildTarget": "gratia-pay-web:build"
} }
}, },
"test": { "test": {
@ -163,19 +166,6 @@
"scripts": [] "scripts": []
} }
}, },
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": [
"tsconfig.app.json",
"tsconfig.spec.json",
"e2e/tsconfig.json"
],
"exclude": [
"**/node_modules/**"
]
}
},
"e2e": { "e2e": {
"builder": "@angular-devkit/build-angular:protractor", "builder": "@angular-devkit/build-angular:protractor",
"options": { "options": {
@ -191,7 +181,6 @@
} }
} }
}, },
"defaultProject": "gratia-pay-web",
"cli": { "cli": {
"analytics": "0444f874-a08a-4231-b156-0967f0496267" "analytics": "0444f874-a08a-4231-b156-0967f0496267"
} }

@ -3,7 +3,7 @@
"compilerOptions": { "compilerOptions": {
"outDir": "../out-tsc/e2e", "outDir": "../out-tsc/e2e",
"module": "commonjs", "module": "commonjs",
"target": "es5", "target": "es2018",
"types": [ "types": [
"jasmine", "jasmine",
"jasminewd2", "jasminewd2",

21170
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": "~9.0.1", "@angular/animations": "^17.3.12",
"@angular/common": "~9.0.1", "@angular/common": "^17.3.12",
"@angular/compiler": "~9.0.1", "@angular/compiler": "^17.3.12",
"@angular/core": "~9.0.1", "@angular/core": "^17.3.12",
"@angular/forms": "~9.0.1", "@angular/forms": "^17.3.12",
"@angular/platform-browser": "~9.0.1", "@angular/platform-browser": "^17.3.12",
"@angular/platform-browser-dynamic": "~9.0.1", "@angular/platform-browser-dynamic": "^17.3.12",
"@angular/router": "~9.0.1", "@angular/router": "^17.3.12",
"@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",
@ -26,29 +26,29 @@
"ng-zorro-antd": "^9.3.0", "ng-zorro-antd": "^9.3.0",
"ngx-echarts": "^4.2.2", "ngx-echarts": "^4.2.2",
"rxjs": "~6.5.4", "rxjs": "~6.5.4",
"tslib": "^1.10.0", "tslib": "^2.0.0",
"zone.js": "~0.10.2" "zone.js": "~0.14.10"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "~0.900.2", "@angular-devkit/build-angular": "^17.3.17",
"@angular/cli": "~9.0.2", "@angular/cli": "^17.3.17",
"@angular/compiler-cli": "~9.0.1", "@angular/compiler-cli": "^17.3.12",
"@angular/language-service": "~9.0.1", "@angular/language-service": "^17.3.12",
"@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",
"codelyzer": "^5.1.2", "codelyzer": "^5.1.2",
"jasmine-core": "~3.5.0", "jasmine-core": "~3.5.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~5.0.0",
"karma": "~4.3.0", "karma": "~6.4.4",
"karma-chrome-launcher": "~3.1.0", "karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~2.1.0", "karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~2.0.1", "karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.4.2", "karma-jasmine-html-reporter": "^1.5.0",
"protractor": "~5.4.3", "protractor": "~7.0.0",
"ts-md5": "^1.2.7", "ts-md5": "^1.2.7",
"ts-node": "~8.3.0", "ts-node": "~8.3.0",
"tslint": "~5.18.0", "tslint": "~6.1.0",
"typescript": "~3.7.5" "typescript": "~5.4.5"
} }
} }

@ -0,0 +1,21 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { MerchantAllocationComponent } from './merchant-allocation/merchant-allocation.component';
import { PrizePoolDetailComponent } from './prize-pool-detail/prize-pool-detail.component';
import { PrizePoolComponent } from './prize-pool/prize-pool.component';
const routes: Routes = [
{ path: 'merchant-allocation', component: MerchantAllocationComponent },
{ path: 'prize-pool', component: PrizePoolComponent },
{path: 'prize-pool-detail', component:PrizePoolDetailComponent, data: {
customBreadcrumb: '奖池详情'
}}
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class ActivityMoneyRoutingModule { }

@ -0,0 +1,30 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {AppCommonModule} from '../../app-common.module';
import { ActivityMoneyRoutingModule } from './activity-money-routing.module';
import { MerchantAllocationComponent } from './merchant-allocation/merchant-allocation.component';
import { PrizePoolComponent } from './prize-pool/prize-pool.component';
import { PrizePoolDetailComponent } from './prize-pool-detail/prize-pool-detail.component';
@NgModule({
declarations: [
MerchantAllocationComponent,
PrizePoolComponent,
PrizePoolDetailComponent
],
imports: [
CommonModule,
ActivityMoneyRoutingModule,
NgZorroAntdModule,
ReactiveFormsModule,
FormsModule,
BreadcrumbModule,
AppCommonModule,
]
})
export class ActivityMoneyModule { }

@ -0,0 +1,152 @@
<!-- start 面包屑 -->
<app-breadcrumb></app-breadcrumb>
<!-- end 面包屑 -->
<!--条件搜索-->
<nz-spin [nzSpinning]="loadingObject.spinning" nzTip="{{loadingObject.msg}}">
<div class="inner-content">
<form nz-form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)">
<div nz-row>
<div nz-col nzSpan="8" >
<nz-form-item>
<nz-form-label [nzSpan]="8">商户号</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="merNo" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8" >
<nz-form-item>
<nz-form-label [nzSpan]="8">商户名称</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="merName" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8" >
<nz-form-item>
<nz-form-label [nzSpan]="8">商户简称</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="merAbbreviate" />
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row *ngIf="selectedIndex==1">
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">状态</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select nzAllowClear formControlName="status">
<!-- <nz-option nzLabel="不可用" nzValue="0"></nz-option> -->
<nz-option nzLabel="正常" nzValue="1"></nz-option>
<nz-option nzLabel="冻结" nzValue="2"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row>
<div nz-col nzSpan="24" class="search-button">
<button nz-button nzType="primary"><i nz-icon nzType="search" nzTheme="outline"></i>搜索</button>
<button nz-button nzType="default" (click)="resetForm()"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button>
</div>
</div>
</form>
</div>
<nz-tabset class="inner-content" [(nzSelectedIndex)]="selectedIndex" (nzSelectChange)="nzSelectChange([$event])">
<nz-tab nzTitle="未参与" >
<div class="mart10">
<div class="operating-button">
<nz-badge [nzCount]="setOfCheckedId.size">
<button nz-button nzType="primary" [disabled]="setOfCheckedId.size === 0" (click)="attendConfirm()">
添加
</button>
</nz-badge>
</div>
<span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span>
<nz-table
#rowSelectionTable
[nzData]="dataObject.list"
[nzTotal]="dataObject.total"
[nzFrontPagination]="false"
[nzLoading]="tableLoading"
[nzPageIndex]="whereObject.pageNum"
[nzPageSize]="whereObject.pageSize"
(nzPageIndexChange)="requestqueryNotPartMerList($event)"
>
<thead>
<tr>
<th [nzChecked]="checked" [nzShowCheckbox]="true" (nzCheckedChange)="onAllChecked($event)"></th>
<th >商户号</th>
<th>商户名称</th>
<th >商户简称</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of rowSelectionTable.data;let i = index">
<td
[nzChecked]="setOfCheckedId.has(data.merNo)"
(nzCheckedChange)="onItemChecked(data.merNo, $event)"
></td>
<td>{{data.merNo}}</td>
<td>{{data.merName}}</td>
<td>{{data.merAbbreviate}}</td>
</tr>
</tbody>
</nz-table>
</div>
</nz-tab>
<nz-tab nzTitle="已参与">
<div class="mart10">
<span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span>
<nz-table #basicTable
[nzData]="dataObject.list"
[nzTotal]="dataObject.total"
[nzFrontPagination]="false"
[nzLoading]="tableLoading"
[nzPageIndex]="whereObject.pageNum"
[nzPageSize]="whereObject.pageSize"
(nzPageIndexChange)="requestqueryPartMerList($event)"
>
<thead>
<tr>
<th >商户号</th>
<th >商户名称</th>
<th >商户简称</th>
<th >状态</th>
<th >加入时间</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data;let i = index">
<td>{{data.merNo}}</td>
<td>{{data.merName}}</td>
<td>{{data.merAbbreviate}}</td>
<td [class]="data.status==2?'fred':''">{{data.status | allocationStatus}}</td>
<td >{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td nzRight="0px" class="table-td-operation">
<a *ngIf="data.status==1" (click)="forbidden(data.merNo)">禁用</a>
<a *ngIf="data.status==2" (click)="enable(data.merNo)">启用</a>
</td>
</tr>
</tbody>
</nz-table>
</div>
</nz-tab>
</nz-tabset>
</nz-spin>

@ -0,0 +1,28 @@
/* tslint:disable:no-unused-variable */
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';
import { MerchantAllocationComponent } from './merchant-allocation.component';
describe('MerchantAllocationComponent', () => {
let component: MerchantAllocationComponent;
let fixture: ComponentFixture<MerchantAllocationComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ MerchantAllocationComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(MerchantAllocationComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

@ -0,0 +1,229 @@
import { Component, OnInit } from '@angular/core';
import {TradeOrderService} from '../../../services/trade-order.service';
import {LocalStorageService} from '../../../services/local-storage.service';
import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {environment} from '../../../../environments/environment';
import { ActivityMoneyService } from 'src/app/services/activity-money.service';
@Component({
selector: 'app-merchant-allocation',
templateUrl: './merchant-allocation.component.html',
styleUrls: ['./merchant-allocation.component.scss']
})
export class MerchantAllocationComponent implements OnInit {
FILE_URL = environment.imageUrl;
loading = false;
dataObject: any = {};
tableLoading = true;
searchForm: UntypedFormGroup;
pageNum: number;
whereObject: any = {};
loadingObject = {
spinning: false,
msg: '加载中'
};
selectedIndex:number = 0;
checked = false;
setOfCheckedId = new Set<number>();
constructor(
private modal: NzModalService,
private message: NzMessageService,
private activityMoneyService:ActivityMoneyService,
private form: UntypedFormBuilder) { }
ngOnInit(): void {
this.searchForm = this.form.group({
merNo: [null],
merName: [null],
merAbbreviate: [null],
status:[null],
});
/* this.requestData(1); */
if(this.selectedIndex==0){
this.requestqueryNotPartMerList(1);//未参与
}else{
this.requestqueryPartMerList(1);//已参与
}
}
/**
*
*/
requestqueryNotPartMerList(pageNum) {
this.setOfCheckedId.clear();
this.checked=false;
this.tableLoading = true;
this.whereObject['pageNum'] = pageNum;
this.whereObject['pageSize'] = 10;
this.activityMoneyService.queryNotPartMerList(this.whereObject, data => {
if (data['return_code'] === '000000') {
this.dataObject = data['return_data'];
} else {
this.message.error(data['return_msg']);
}
this.tableLoading = false;
});
}
/**
*
*/
requestqueryPartMerList(pageNum) {
this.tableLoading = true;
this.whereObject['pageNum'] = pageNum;
this.whereObject['pageSize'] = 10;
this.activityMoneyService.queryPartMerList(this.whereObject, data => {
if (data['return_code'] === '000000') {
this.dataObject = data['return_data'];
} else {
this.message.error(data['return_msg']);
}
this.tableLoading = false;
});
}
/**
*
* @param whereObject
*/
search(whereObject: object) {
this.whereObject = whereObject;
if(this.selectedIndex==0){
this.requestqueryNotPartMerList(1);//未参与
}else{
this.requestqueryPartMerList(1);//已参与
}
}
/**
*
*/
resetForm(): void {
this.searchForm.reset();
}
/**
*
*/
attendConfirm(): void {
const requestData = [...this.setOfCheckedId];
this.modal.confirm({
nzTitle: '提示',
nzContent: '确定选中这些商户吗?',
nzOkText: '是',
nzCancelText: '否',
nzOkType: 'primary',
nzOnOk: () => this.addPartMer(requestData)
});
}
addPartMer(merNoList){
let arr = merNoList.map(item=>{
return {merNo: item}
})
let params={
"merNoArray": arr
}
this.activityMoneyService.addPartMer(params, data => {
if (data['return_code'] === '000000') {
this.message.create("success", data['return_data']);
this.requestqueryNotPartMerList(1)
} else {
this.message.error(data['return_msg']);
}
});
}
/* 禁用 */
forbidden(merNo){
let params = {
"merNo":merNo
}
this.activityMoneyService.disable(params, data => {
if (data['return_code'] === '000000') {
this.message.create("success", data['return_data']);
this.requestqueryPartMerList(1);//已参与
} else {
this.message.error(data['return_msg']);
}
});
}
/* 启用 */
enable(merNo){
let params = {
"merNo":merNo
}
this.activityMoneyService.enable(params, data => {
if (data['return_code'] === '000000') {
this.message.create("success", data['return_data']);
this.requestqueryPartMerList(1);//已参与
} else {
this.message.error(data['return_msg']);
}
});
}
/* 切换tab */
nzSelectChange(e){
this.whereObject={};
this.resetForm();
this.dataObject={};
this.setOfCheckedId.clear();
this.checked=false;
if(this.selectedIndex==0){
this.requestqueryNotPartMerList(1);//未参与
}else{
this.requestqueryPartMerList(1);//已参与
}
}
/* */
updateCheckedSet(merNo: number, checked: boolean): void {
if (checked) {
this.setOfCheckedId.add(merNo);
} else {
this.setOfCheckedId.delete(merNo);
}
}
refreshCheckedStatus(): void {
const listOfEnabledData = this.dataObject.list;
this.checked = listOfEnabledData.every(({ merNo }) => this.setOfCheckedId.has(merNo));
}
onItemChecked(merNo: number, checked: boolean): void {
this.updateCheckedSet(merNo, checked);
this.refreshCheckedStatus();
}
/*全选 */
onAllChecked(checked: boolean): void {
console.log(checked,"checked")
this.dataObject.list.forEach(({ merNo }) => this.updateCheckedSet(merNo, checked));
this.refreshCheckedStatus();
}
/* */
}

@ -0,0 +1,64 @@
<!-- start 面包屑 -->
<nz-breadcrumb [nzAutoGenerate]="true" [nzRouteLabel]="'customBreadcrumb'"></nz-breadcrumb>
<!-- end 面包屑 -->
<div class="inner-content">
<nz-tabset [(nzSelectedIndex)]="selectedIndex">
<nz-tab nzTitle="奖池详情">
<nz-descriptions *ngIf="prizePoolDetailsObject.rebateReward" nzBordered [nzColumn]="{ xxl: 3, xl: 2, lg: 2, md: 2, sm: 2, xs: 1 }">
<nz-descriptions-item nzTitle="奖池编号">{{prizePoolDetailsObject.rebateReward.batchIdentifier }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="奖池金额">{{prizePoolDetailsObject.rebateReward.amount }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="参与商家数量">{{prizePoolDetailsObject.rebateReward.partMerNum }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="参与交易金额">{{prizePoolDetailsObject.rebateReward.partTradeAmount }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="活动金比例(%)">{{prizePoolDetailsObject.rebateReward.ratio }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="状态">{{prizePoolDetailsObject.rebateReward.status | activityMoneyStatus }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="奖池开始时间">{{prizePoolDetailsObject.rebateReward.timeStart | date : 'yyyy-MM-dd HH:mm:ss' }}</nz-descriptions-item>
<nz-descriptions-item nzTitle="奖池结束时间">{{prizePoolDetailsObject.rebateReward.timeEnd | date : 'yyyy-MM-dd HH:mm:ss' }}</nz-descriptions-item>
</nz-descriptions>
</nz-tab>
<nz-tab nzTitle="奖池名单">
<div class="btr">
<button nz-button nzType="primary" [(disabled)]="loadingObject.spinning" (click)="exportTradeOrder(batchIdentifier) ">
<i nz-icon nzType="upload" nzTheme="outline"></i>
导出
</button>
</div>
<nz-spin [nzSpinning]="loadingObject.spinning" nzTip="{{loadingObject.msg}}">
<nz-table
#basicTable2
[nzData]="prizePoolDetailsObject.rebateRewardRoster || [] "
[nzScroll]="{ x: '1350px'}"
[nzPageSize]="10"
>
<thead>
<tr>
<th nzWidth="150px">奖池编号</th>
<th nzWidth="150px">业务员名称</th>
<th nzWidth="180px">商户号</th>
<th nzWidth="180px">商户名称</th>
<th nzWidth="150px">商户简称</th>
<th nzWidth="150px">商户账户</th>
<th nzWidth="150px">奖池占比(%)</th>
<th nzWidth="150px">返利金额</th>
<th nzWidth="150px" nzRight="0px">状态</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable2.data">
<td>{{data.batchIdentifier}}</td>
<td>{{data.salesmanName}}</td>
<td>{{data.merNo}}</td>
<td>{{data.merName}}</td>
<td>{{data.merAbbreviate}}</td>
<td>{{data.merAccountNumber}}</td>
<td>{{data.rewardRatio}}</td>
<td>{{data.amount}}</td>
<td nzRight="0px" class="table-td-operation">{{data.status | activityMoneyStatus}}</td>
</tr>
</tbody>
</nz-table>
</nz-spin>
</nz-tab>
</nz-tabset>
</div>

@ -0,0 +1,4 @@
.btr{
text-align: right;
margin-bottom: 10px;
}

@ -0,0 +1,28 @@
/* tslint:disable:no-unused-variable */
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';
import { PrizePoolDetailComponent } from './prize-pool-detail.component';
describe('PrizePoolDetailComponent', () => {
let component: PrizePoolDetailComponent;
let fixture: ComponentFixture<PrizePoolDetailComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PrizePoolDetailComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PrizePoolDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

@ -0,0 +1,70 @@
import { Component, OnInit } from '@angular/core';
import { ActivityMoneyService } from 'src/app/services/activity-money.service';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {environment} from '../../../../environments/environment';
import {ActivatedRoute, Params} from '@angular/router';
@Component({
selector: 'app-prize-pool-detail',
templateUrl: './prize-pool-detail.component.html',
styleUrls: ['./prize-pool-detail.component.scss']
})
export class PrizePoolDetailComponent implements OnInit {
FILE_URL = environment.imageUrl;
selectedIndex:number = 0;
prizePoolDetailsObject:any={};
loadingObject = {
spinning: false,
msg: '加载中'
};
batchIdentifier="";
constructor(
private modal: NzModalService,
private message: NzMessageService,
private activityMoneyService:ActivityMoneyService,
private activatedRoute: ActivatedRoute,
) { }
ngOnInit() {
this.activatedRoute.queryParams.subscribe((queryParams: Params) => {
if (queryParams['batchIdentifier'] != null && queryParams['batchIdentifier'].length > 0) {
this.batchIdentifier=queryParams['batchIdentifier'];
this.prizePoolDetails(queryParams['batchIdentifier']);
}
});
}
/*打开奖池详情 */
prizePoolDetails(batchIdentifier){
let params ={
batchIdentifier:batchIdentifier
}
this.activityMoneyService.queryRewardDetail(params, data => {
if (data['return_code'] === '000000') {
this.prizePoolDetailsObject = data['return_data'];
} else {
this.message.error(data['return_msg']);
}
});
}
/* 导出商户明天 */
exportTradeOrder(batchIdentifier) {
this.loadingObject.spinning = true;
this.loadingObject.msg = '导出中...';
let params ={
batchIdentifier:batchIdentifier
}
this.activityMoneyService.exportRewardRoster(params, data => {
if (data['return_code'] === '000000') {
// window.location.href = this.FILE_URL + data['return_data'];
window.open(data['return_data']);
} else {
this.message.error(data['return_msg']);
}
this.loadingObject.spinning = false;
});
}
}

@ -0,0 +1,93 @@
<!-- start 面包屑 -->
<app-breadcrumb></app-breadcrumb>
<!-- end 面包屑 -->
<!--条件搜索-->
<div class="inner-content">
<form nz-form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)">
<div nz-row>
<div nz-col nzSpan="8" >
<nz-form-item>
<nz-form-label [nzSpan]="8">奖池编号</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="batchIdentifier" />
</nz-form-control>
</nz-form-item>
</div>
<div nz-col nzSpan="8">
<nz-form-item>
<nz-form-label [nzSpan]="8">奖池状态</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select nzAllowClear formControlName="status">
<!-- <nz-option nzLabel="不可用" nzValue="0"></nz-option> -->
<nz-option nzLabel="未发放" nzValue="1"></nz-option>
<nz-option nzLabel="已发放" nzValue="2"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row>
<div nz-col nzSpan="24" class="search-button">
<button nz-button nzType="primary"><i nz-icon nzType="search" nzTheme="outline"></i>搜索</button>
<button nz-button nzType="default" (click)="resetForm()"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button>
</div>
</div>
</form>
</div>
<div class="inner-content">
<span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span>
<!-- <div class="operating-button">
<button nz-button nzType="primary" class="right-btn" (click)="exportTradeOrder()" >导出交易</button>
</div> -->
<!--数组表格 -->
<nz-table #basicTable
[nzData]="dataObject.list"
[nzTotal]="dataObject.total"
[nzFrontPagination]="false"
[nzLoading]="tableLoading"
[nzPageIndex]="whereObject.pageNum"
[nzPageSize]="whereObject.pageSize"
(nzPageIndexChange)="requestData($event)"
[nzScroll]="{ x: '1150px'}">
<thead>
<tr>
<th nzWidth="180px">奖池编号</th>
<th nzWidth="150px">奖池金额</th>
<th nzWidth="150px">参与商家数量</th>
<th nzWidth="150px">参与交易金额</th>
<th nzWidth="150px">活动金比例(%)</th>
<th nzWidth="100px">状态</th>
<th nzWidth="200px">奖池开始时间</th>
<th nzWidth="200px">奖池结束时间</th>
<th nzWidth="150px" nzRight="0px">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data;let i = index">
<td>{{data.batchIdentifier}}</td>
<td>{{data.amount}}</td>
<td>{{data.partMerNum}}</td>
<td>{{data.partTradeAmount}}</td>
<td>{{data.ratio}}</td>
<td>{{data.status | activityMoneyStatus}}</td>
<td>{{data.timeStart | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{data.timeEnd | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td nzRight="0px" class="table-td-operation">
<a [routerLink]="['/admin/activity-money/prize-pool-detail']" [queryParams]="{batchIdentifier: data.batchIdentifier}">详情</a>
<nz-divider *ngIf="data.status==1" nzType="vertical"></nz-divider>
<a *ngIf="data.status==1" (click)="disbursementAmount(data.batchIdentifier)">发放</a>
</td>
</tr>
</tbody>
</nz-table>
</div>

@ -0,0 +1,28 @@
/* tslint:disable:no-unused-variable */
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { By } from '@angular/platform-browser';
import { DebugElement } from '@angular/core';
import { PrizePoolComponent } from './prize-pool.component';
describe('PrizePoolComponent', () => {
let component: PrizePoolComponent;
let fixture: ComponentFixture<PrizePoolComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ PrizePoolComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(PrizePoolComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

@ -0,0 +1,100 @@
import { Component, OnInit } from '@angular/core';
import {LocalStorageService} from '../../../services/local-storage.service';
import {UntypedFormBuilder, UntypedFormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {environment} from '../../../../environments/environment';
import { ActivityMoneyService } from 'src/app/services/activity-money.service';
@Component({
selector: 'app-prize-pool',
templateUrl: './prize-pool.component.html',
styleUrls: ['./prize-pool.component.scss']
})
export class PrizePoolComponent implements OnInit {
FILE_URL = environment.imageUrl;
loading = false;
dataObject: any = {};
tableLoading = true;
searchForm: UntypedFormGroup;
pageNum: number;
whereObject: any = {};
constructor(private store: LocalStorageService, // 数据请求
private modal: NzModalService,
private message: NzMessageService,
private activityMoneyService:ActivityMoneyService,
private form: UntypedFormBuilder) { }
ngOnInit(): void {
this.searchForm = this.form.group({
batchIdentifier: [null],
status: [null],
});
this.requestData(1);
}
/**
*
*/
requestData(pageNum) {
this.tableLoading = true;
this.whereObject['pageNum'] = pageNum;
this.whereObject['pageSize'] = 10;
this.activityMoneyService.queryRewardList(this.whereObject, data => {
if (data['return_code'] === '000000') {
this.dataObject = data['return_data'];
} else {
this.modal.error(data['return_msg']);
}
this.tableLoading = false;
});
}
/**
*
* @param whereObject
*/
search(whereObject: object) {
this.whereObject = whereObject;
this.requestData(1);
}
/**
*
*/
resetForm(): void {
this.searchForm.reset();
}
/* 发放奖池金额 */
disbursementAmount(batchIdentifier){
let params ={
batchIdentifier:batchIdentifier
}
this.modal.confirm({
nzTitle: '提示',
nzContent: '确定发放奖池金额吗?',
nzOnOk: () => this.grantReward(params)
});
}
grantReward(params){
this.activityMoneyService.grantReward(params, data => {
if (data['return_code'] === '000000') {
this.message.create("success", data['return_data']);
this.requestData(1);
} else {
this.message.error(data['return_msg']);
}
});
}
}

@ -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({

@ -38,7 +38,7 @@
<div nz-col nzSpan="8"> <div nz-col nzSpan="8">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="8">商户交易号</nz-form-label> <nz-form-label [nzSpan]="8">商户交易号</nz-form-label>
<nz-form-control [nzSpan]="14"> <nz-form-control [nzSpan]="14">z
<input type="text" nz-input formControlName="outTradeNo" /> <input type="text" nz-input formControlName="outTradeNo" />
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>

@ -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'];

@ -23,6 +23,7 @@ import {
MerStatusPipe, MerStatusPipe,
CompleteStatusPipe, CompleteStatusPipe,
MerTypePipe, DeviceStatusPipe, PlatformTypePipe, DeviceTypePipe, DeviceOrderTypePipe, CreateTypePipe, MerTypePipe, DeviceStatusPipe, PlatformTypePipe, DeviceTypePipe, DeviceOrderTypePipe, CreateTypePipe,
ActivityMoneyPipe,AllocationStatus
} from './pipes'; } from './pipes';
import {DeviceOrderStatusPipe} from './pipes/device/device-order-status.pipe'; import {DeviceOrderStatusPipe} from './pipes/device/device-order-status.pipe';
import {DeviceOrderPayTypePipe} from './pipes/device/device-order-pay-type.pipe'; import {DeviceOrderPayTypePipe} from './pipes/device/device-order-pay-type.pipe';
@ -49,7 +50,9 @@ const PIPES = [
DeviceOrderPayTypePipe, DeviceOrderPayTypePipe,
PlatformTypePipe, PlatformTypePipe,
CreateTypePipe, CreateTypePipe,
SettleTypePipe SettleTypePipe,
ActivityMoneyPipe,
AllocationStatus
]; ];
@NgModule({ @NgModule({
@ -70,10 +73,10 @@ const PIPES = [
}) })
export class AppCommonModule { export class AppCommonModule {
static forRoot() { static forRoot(): ModuleWithProviders<AppCommonModule> {
return { return {
ngModule: AppCommonModule, ngModule: AppCommonModule,
providers: [], providers: [],
}; };
} }
} }

@ -88,6 +88,11 @@ const routes: Routes = [
loadChildren: () => import('./admin/cms/cms.module').then(m => m.CmsModule), loadChildren: () => import('./admin/cms/cms.module').then(m => m.CmsModule),
canActivate: [InitGuardService] canActivate: [InitGuardService]
}, },
{
path: 'activity-money',
loadChildren: () => import('./admin/activity-money/activity-money.module').then(m => m.ActivityMoneyModule),
canActivate: [InitGuardService]
},
], ],
}, },
{ {

@ -0,0 +1,41 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
name: 'activityMoneyStatus'
})
export class ActivityMoneyPipe implements PipeTransform {
transform(statusNum: number): string {
switch (statusNum) {
case 0:
return '不可用';
case 1:
return '未发放';
case 2:
return '已发放';
default:
return '未知';
}
}
}
@Pipe({
name: 'allocationStatus'
})
export class AllocationStatus implements PipeTransform {
transform(statusNum: number): string {
switch (statusNum) {
case 0:
return '不可用';
case 1:
return '正常';
case 2:
return '冻结';
default:
return '未知';
}
}
}

@ -9,6 +9,10 @@ export class DeviceTypePipe implements PipeTransform {
switch (statusNum) { switch (statusNum) {
case 1: case 1:
return '4G收款音响'; return '4G收款音响';
case 2:
return '码牌';
case 3:
return '小票打印机';
default: default:
return '未知'; return '未知';
} }

@ -18,4 +18,5 @@ export * from './device/device-type.pipe';
export * from './device/device-order-type.pipe'; export * from './device/device-order-type.pipe';
export * from './device/device-order-status.pipe'; export * from './device/device-order-status.pipe';
export * from './device/device-order-pay-type.pipe'; export * from './device/device-order-pay-type.pipe';
export * from './activity-money/activity-money.pipe';

@ -15,6 +15,10 @@ export class PayModePipe implements PipeTransform {
return '银联'; return '银联';
case 'DRAGON': case 'DRAGON':
return '龙支付'; return '龙支付';
case 'CREDIT_CARDS_PERIOD':
return '银联分期';
case 'QUICK':
return '快捷支付';
} }
} }

@ -0,0 +1,121 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { environment } from '../../environments/environment';
import { CommonsService } from './commons.service';
@Injectable({
providedIn: 'root'
})
export class ActivityMoneyService {
constructor(
private http: HttpClient,
private commonsService: CommonsService,
) { }
/* ----------------------------活动金 - 参与用户配置--------------------------------- */
/**
*
* @param paramObject
* @param callBack
*/
queryNotPartMerList(paramObject: object, callBack) {
this.http.get(environment.baseUrl + 'rebatePartMer/queryNotPartMerList?' + this.commonsService.getWhereCondition(paramObject)).subscribe(data => {
callBack(data);
});
}
/**
*
* @param paramObject
* @param callBack
*/
addPartMer(paramObject: object, callBack) {
this.http.post(environment.baseUrl + 'rebatePartMer/addPartMer', paramObject).subscribe(data => {
callBack(data);
});
}
/**
*
* @param paramObject
* @param callBack
*/
disable(paramObject: object, callBack) {
this.http.post(environment.baseUrl + 'rebatePartMer/disable', paramObject).subscribe(data => {
callBack(data);
});
}
/**
*
* @param paramObject
* @param callBack
*/
enable(paramObject: object, callBack) {
this.http.post(environment.baseUrl + 'rebatePartMer/enable', paramObject).subscribe(data => {
callBack(data);
});
}
/**
*
* @param paramObject
* @param callBack
*/
queryPartMerList(paramObject: object, callBack) {
this.http.get(environment.baseUrl + 'rebatePartMer/queryPartMerList?' + this.commonsService.getWhereCondition(paramObject)).subscribe(data => {
callBack(data);
});
}
/* ----------------------------活动金 - 奖池业务--------------------------------- */
/**
*
* @param paramObject
* @param callBack
*/
queryRewardList(paramObject: object, callBack) {
this.http.get(environment.baseUrl + 'rebateReward/queryRewardList?' + this.commonsService.getWhereCondition(paramObject)).subscribe(data => {
callBack(data);
});
}
/**
*
* @param paramObject
* @param callBack
*/
queryRewardDetail(paramObject: object, callBack) {
this.http.get(environment.baseUrl + 'rebateReward/queryRewardDetail?' + this.commonsService.getWhereCondition(paramObject)).subscribe(data => {
callBack(data);
});
}
/**
*
* @param paramObject
* @param callBack
*/
grantReward(paramObject: object, callBack) {
this.http.post(environment.baseUrl + 'rebateReward/grantReward', paramObject).subscribe(data => {
callBack(data);
});
}
/**
*
* @param paramObject
* @param callBack
*/
exportRewardRoster(paramObject: object, callBack) {
this.http.get(environment.baseUrl + 'rebateReward/exportRewardRoster?' + this.commonsService.getWhereCondition(paramObject)).subscribe(data => {
callBack(data);
});
}
}

@ -1,11 +1,11 @@
import { Injectable } from '@angular/core'; import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router'; import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
import {LocalStorageService} from './local-storage.service'; import {LocalStorageService} from './local-storage.service';
import {INIT_FLAG, ROLE_TYPE} from './local-storage.namespace'; import {INIT_FLAG, ROLE_TYPE} from './local-storage.namespace';
@Injectable() @Injectable()
export class InitGuardService implements CanActivate { export class InitGuardService {
constructor( constructor(
private storage: LocalStorageService, private storage: LocalStorageService,
private router: Router, private router: Router,

@ -20,4 +20,4 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact * This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown. * on performance if an error is thrown.
*/ */
// import 'zone.js/dist/zone-error'; // Included with Angular CLI. // import 'zone.js/plugins/zone-error'; // Included with Angular CLI.

@ -18,16 +18,6 @@
* BROWSER POLYFILLS * BROWSER POLYFILLS
*/ */
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
// import 'classlist.js'; // Run `npm install --save classlist.js`.
/**
* Web Animations `@angular/platform-browser/animations`
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
*/
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
/** /**
* By default, zone.js will patch all possible macroTask and DomEvents * By default, zone.js will patch all possible macroTask and DomEvents
* user can disable parts of macroTask/DomEvents patch by setting following flags * user can disable parts of macroTask/DomEvents patch by setting following flags
@ -55,7 +45,7 @@
/*************************************************************************************************** /***************************************************************************************************
* Zone JS is required by default for Angular itself. * Zone JS is required by default for Angular itself.
*/ */
import 'zone.js/dist/zone'; // Included with Angular CLI. import 'zone.js'; // Included with Angular CLI.
/*************************************************************************************************** /***************************************************************************************************

@ -1,25 +1,16 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files // This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/dist/zone-testing'; import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing'; import { getTestBed } from '@angular/core/testing';
import { import {
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing'; } from '@angular/platform-browser-dynamic/testing';
declare const require: {
context(path: string, deep?: boolean, filter?: RegExp): {
keys(): string[];
<T>(id: string): T;
};
};
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting() platformBrowserDynamicTesting(), {
teardown: { destroyAfterEach: false }
}
); );
// Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules.
context.keys().map(context);

@ -7,10 +7,10 @@
"declaration": false, "declaration": false,
"downlevelIteration": true, "downlevelIteration": true,
"experimentalDecorators": true, "experimentalDecorators": true,
"module": "esnext", "module": "es2020",
"moduleResolution": "node", "moduleResolution": "node",
"importHelpers": true, "importHelpers": true,
"target": "es2015", "target": "ES2022",
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"
], ],
@ -18,7 +18,8 @@
"es2018", "es2018",
"dom" "dom"
], ],
"allowSyntheticDefaultImports": true "allowSyntheticDefaultImports": true,
"useDefineForClassFields": false
}, },
"angularCompilerOptions": { "angularCompilerOptions": {
"fullTemplateTypeCheck": true, "fullTemplateTypeCheck": true,

@ -1,8 +1,15 @@
{ {
"extends": "tslint:recommended", "extends": "tslint:recommended",
"rules": { "rules": {
"align": {
"options": [
"parameters",
"statements"
]
},
"array-type": false, "array-type": false,
"arrow-parens": false, "arrow-parens": false,
"arrow-return-shorthand": true,
"deprecation": { "deprecation": {
"severity": "warning" "severity": "warning"
}, },
@ -12,15 +19,23 @@
"allow-leading-underscore" "allow-leading-underscore"
], ],
"no-string-literal": false, "no-string-literal": false,
"curly": true,
"component-class-suffix": true, "component-class-suffix": true,
"contextual-lifecycle": true, "contextual-lifecycle": true,
"directive-class-suffix": true, "directive-class-suffix": true,
"eofline": true,
"directive-selector": [ "directive-selector": [
true, true,
"attribute", "attribute",
"app", "app",
"camelCase" "camelCase"
], ],
"import-spacing": true,
"indent": {
"options": [
"spaces"
]
},
"component-selector": [ "component-selector": [
true, true,
"element", "element",
@ -84,12 +99,54 @@
"no-inputs-metadata-property": true, "no-inputs-metadata-property": true,
"no-output-native": true, "no-output-native": true,
"no-output-on-prefix": true, "no-output-on-prefix": true,
"semicolon": {
"options": [
"always"
]
},
"space-before-function-paren": {
"options": {
"anonymous": "never",
"asyncArrow": "always",
"constructor": "never",
"method": "never",
"named": "never"
}
},
"no-output-rename": true, "no-output-rename": true,
"no-outputs-metadata-property": true, "no-outputs-metadata-property": true,
"template-banana-in-box": true, "template-banana-in-box": true,
"typedef-whitespace": {
"options": [
{
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
},
{
"call-signature": "onespace",
"index-signature": "onespace",
"parameter": "onespace",
"property-declaration": "onespace",
"variable-declaration": "onespace"
}
]
},
"template-no-negated-async": true, "template-no-negated-async": true,
"use-lifecycle-interface": true, "use-lifecycle-interface": true,
"use-pipe-transform-interface": true "use-pipe-transform-interface": true,
"whitespace": {
"options": [
"check-branch",
"check-decl",
"check-operator",
"check-separator",
"check-type",
"check-typecast"
]
}
}, },
"rulesDirectory": [ "rulesDirectory": [
"codelyzer" "codelyzer"

Loading…
Cancel
Save