commit
7196d106b1
@ -0,0 +1,90 @@ |
|||||||
|
<!-- start 面包屑 --> |
||||||
|
<app-breadcrumb></app-breadcrumb> |
||||||
|
<!-- end 面包屑 --> |
||||||
|
|
||||||
|
<div class="inner-content"> |
||||||
|
<div class="main"> |
||||||
|
<form nz-form [formGroup]="dataFrom"> |
||||||
|
<div nz-row> |
||||||
|
<div nz-col class="gutter-row" [nzSpan]="24"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="8" nzRequired>油号</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="8"> |
||||||
|
<nz-select formControlName="oilNo"> |
||||||
|
<nz-option *ngFor="let item of oilNoArray" nzLabel="{{item.codeName}}" nzValue="{{item.codeValue}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col class="gutter-row" [nzSpan]="24"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="8" nzRequired>价格类型</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="8"> |
||||||
|
<nz-select formControlName="priceType" [nzPlaceHolder]="'请选择价格类型'"> |
||||||
|
<nz-option *ngFor="let item of priceTypeArray" nzLabel="{{item.codeName}}" nzValue="{{item.codeValue}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col class="gutter-row" [nzSpan]="24" *ngIf="dataFrom.value.priceType == 1"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="8" nzRequired>执行地区</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="8"> |
||||||
|
<nz-select formControlName="regionId" nzShowSearch [nzPlaceHolder]="'设置执行地区'"> |
||||||
|
<nz-option *ngFor="let item of regionArray" nzLabel="{{item.regionName}}" nzValue="{{item.regionId}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col class="gutter-row" [nzSpan]="24" *ngIf="(secUserObjectType == 0 || secUserObjectType == 1 || secUserObjectType == 2) && (dataFrom.value.priceType == 2 || dataFrom.value.priceType == 3)"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="8" nzRequired>加油站</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="8"> |
||||||
|
<nz-select formControlName="merStoreIdArray" nzMode="multiple" [nzPlaceHolder]="'请选择加油站'"> |
||||||
|
<nz-option *ngFor="let item of gasArray" nzLabel="{{'【' + item.storeKey + '】' + item.storeName}}" nzValue="{{item.id}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col class="gutter-row" [nzSpan]="24"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="8" nzRequired>执行价格(¥)</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="8"> |
||||||
|
<nz-input-number formControlName="price" [nzMin]="0" [nzMax]="999" [nzStep]="1" [nzPrecision]="2"></nz-input-number> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col class="gutter-row" [nzSpan]="24"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="8" nzRequired>执行方式</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="8"> |
||||||
|
<nz-radio-group formControlName="executionType"> |
||||||
|
<label nz-radio nzValue="1">立刻执行</label> |
||||||
|
<label nz-radio nzValue="2">定时执行</label> |
||||||
|
</nz-radio-group> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col class="gutter-row" [nzSpan]="24" *ngIf="dataFrom.value.executionType == 2"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="8" nzRequired>执行时间</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="8"> |
||||||
|
<nz-date-picker formControlName="startTime" nzFormat="yyyy-MM-dd HH:mm:ss" nzShowTime [nzPlaceHolder]="'设置执行时间'"></nz-date-picker> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
</div> |
||||||
|
|
||||||
|
<div class="btn-div"> |
||||||
|
<button class="btn-post" nz-button nzType="primary" (click)="submitFrom()" [nzLoading]="btnLoading" nzBlock>保存</button> |
||||||
|
</div> |
||||||
|
</form> |
||||||
|
</div> |
||||||
|
</div> |
@ -0,0 +1,13 @@ |
|||||||
|
.btn-div { |
||||||
|
width: 100%; |
||||||
|
text-align: center; |
||||||
|
} |
||||||
|
.btn-post { |
||||||
|
width: 25%; |
||||||
|
} |
||||||
|
nz-input-number { |
||||||
|
width: 100%; |
||||||
|
} |
||||||
|
nz-date-picker { |
||||||
|
width: 100%; |
||||||
|
} |
@ -0,0 +1,25 @@ |
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; |
||||||
|
|
||||||
|
import { OilPriceTaskEditComponent } from './oil-price-task-edit.component'; |
||||||
|
|
||||||
|
describe('OilPriceTaskEditComponent', () => { |
||||||
|
let component: OilPriceTaskEditComponent; |
||||||
|
let fixture: ComponentFixture<OilPriceTaskEditComponent>; |
||||||
|
|
||||||
|
beforeEach(async(() => { |
||||||
|
TestBed.configureTestingModule({ |
||||||
|
declarations: [ OilPriceTaskEditComponent ] |
||||||
|
}) |
||||||
|
.compileComponents(); |
||||||
|
})); |
||||||
|
|
||||||
|
beforeEach(() => { |
||||||
|
fixture = TestBed.createComponent(OilPriceTaskEditComponent); |
||||||
|
component = fixture.componentInstance; |
||||||
|
fixture.detectChanges(); |
||||||
|
}); |
||||||
|
|
||||||
|
it('should create', () => { |
||||||
|
expect(component).toBeTruthy(); |
||||||
|
}); |
||||||
|
}); |
@ -0,0 +1,160 @@ |
|||||||
|
import { Component, OnInit } from '@angular/core'; |
||||||
|
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms'; |
||||||
|
import {NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; |
||||||
|
import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router'; |
||||||
|
import {CommonsService} from '../../../services/commons.service'; |
||||||
|
import {OilPriceTaskService} from '../../../services/oil-price/oil-price-task.service'; |
||||||
|
import {LocalStorageService} from "../../../services/local-storage.service"; |
||||||
|
import {ADMIN_INFO_OBJECT} from "../../../services/local-storage.namespace"; |
||||||
|
|
||||||
|
@Component({ |
||||||
|
selector: 'app-oil-price-task-edit', |
||||||
|
templateUrl: './oil-price-task-edit.component.html', |
||||||
|
styleUrls: ['./oil-price-task-edit.component.scss'] |
||||||
|
}) |
||||||
|
export class OilPriceTaskEditComponent implements OnInit { |
||||||
|
dataFrom: FormGroup; |
||||||
|
btnLoading = false; |
||||||
|
|
||||||
|
oilNoArray = []; |
||||||
|
priceTypeArray = []; |
||||||
|
regionArray = []; |
||||||
|
gasArray = []; |
||||||
|
|
||||||
|
secUserObjectType: number; |
||||||
|
|
||||||
|
constructor(private formBuilder: FormBuilder, |
||||||
|
private modal: NzModalService, |
||||||
|
private oilPriceTaskService: OilPriceTaskService, |
||||||
|
private activatedRoute: ActivatedRoute, |
||||||
|
private commonsService: CommonsService, |
||||||
|
private localStorageService: LocalStorageService , // 请求缓存
|
||||||
|
private router: Router) { |
||||||
|
this.secUserObjectType = Number(this.localStorageService.get(ADMIN_INFO_OBJECT)['secUser']['objectType']); |
||||||
|
} |
||||||
|
|
||||||
|
ngOnInit(): void { |
||||||
|
|
||||||
|
this.dataFrom = this.formBuilder.group({ |
||||||
|
oilNo: ['92', [Validators.required]], |
||||||
|
priceType: [null, [Validators.required]], |
||||||
|
price: [0, [Validators.required]], |
||||||
|
executionType: ['1', [Validators.required]], |
||||||
|
startTime: [null], |
||||||
|
regionId: [null], |
||||||
|
merStoreIdArray: [[]], |
||||||
|
}); |
||||||
|
|
||||||
|
// 管理员
|
||||||
|
if (this.secUserObjectType === 0) { |
||||||
|
// 价格类型 1. 国标价 2. 油站价 3. 优惠幅度
|
||||||
|
this.priceTypeArray.push({ codeValue: 1, codeName: '国标价' }); |
||||||
|
this.priceTypeArray.push({ codeValue: 2, codeName: '油站价' }); |
||||||
|
this.priceTypeArray.push({ codeValue: 3, codeName: '优惠幅度'}); |
||||||
|
|
||||||
|
// 获取全部省级地区
|
||||||
|
this.commonsService.getProvinceList(data => { |
||||||
|
this.regionArray = data['return_data']; |
||||||
|
}); |
||||||
|
|
||||||
|
this.commonsService.getGasSelectList( data => { |
||||||
|
this.gasArray = data['return_data']; |
||||||
|
}); |
||||||
|
|
||||||
|
// 分公司
|
||||||
|
} else if (this.secUserObjectType === 1) { |
||||||
|
// 价格类型 1. 国标价 2. 油站价 3. 优惠幅度
|
||||||
|
this.priceTypeArray.push({ codeValue: 1, codeName: '国标价' }); |
||||||
|
this.priceTypeArray.push({ codeValue: 2, codeName: '油站价' }); |
||||||
|
this.priceTypeArray.push({ codeValue: 3, codeName: '优惠幅度'}); |
||||||
|
|
||||||
|
this.regionArray.push({ regionId: this.localStorageService.get(ADMIN_INFO_OBJECT)['bsCompany']['regionId'], |
||||||
|
regionName: this.localStorageService.get(ADMIN_INFO_OBJECT)['bsCompany']['regionName'] }); |
||||||
|
|
||||||
|
this.commonsService.getGasSelectList( data => { |
||||||
|
this.gasArray = data['return_data']; |
||||||
|
}); |
||||||
|
|
||||||
|
// 商户
|
||||||
|
} else if (this.secUserObjectType === 2) { |
||||||
|
this.priceTypeArray.push({ codeValue: 2, codeName: '油站价' }); |
||||||
|
this.priceTypeArray.push({ codeValue: 3, codeName: '优惠幅度' }); |
||||||
|
|
||||||
|
this.commonsService.getGasSelectList( data => { |
||||||
|
this.gasArray = data['return_data']; |
||||||
|
}); |
||||||
|
|
||||||
|
// 加油站
|
||||||
|
} else if (this.secUserObjectType === 3) { |
||||||
|
this.priceTypeArray.push({ codeValue: 2, codeName: '油站价' }); |
||||||
|
this.priceTypeArray.push({ codeValue: 3, codeName: '优惠幅度' }); |
||||||
|
|
||||||
|
this.dataFrom.patchValue({ merStoreIdArray: [ this.localStorageService.get(ADMIN_INFO_OBJECT)['merchantStore']['id'] ] }); |
||||||
|
} |
||||||
|
|
||||||
|
this.commonsService.getDictionary('GAS_OIL_TYPE', data => { |
||||||
|
this.oilNoArray = data['return_data']; |
||||||
|
}); |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 提交 |
||||||
|
*/ |
||||||
|
submitFrom() { |
||||||
|
for (const i in this.dataFrom.controls) { |
||||||
|
this.dataFrom.controls[i].markAsDirty(); |
||||||
|
this.dataFrom.controls[i].updateValueAndValidity(); |
||||||
|
} |
||||||
|
if (this.dataFrom.status == null || this.dataFrom.status !== 'VALID') { |
||||||
|
this.modal.warning({ |
||||||
|
nzTitle: '提示', |
||||||
|
nzContent: '请规范填写所有的必填项信息', |
||||||
|
}); |
||||||
|
return; |
||||||
|
} |
||||||
|
|
||||||
|
const dataFromValue = this.dataFrom.value; |
||||||
|
const dataArray = []; |
||||||
|
|
||||||
|
if (dataFromValue.priceType === '1') { |
||||||
|
dataArray.push({ |
||||||
|
regionId: dataFromValue.regionId, |
||||||
|
oilNo: dataFromValue.oilNo, |
||||||
|
priceType: dataFromValue.priceType, |
||||||
|
price: dataFromValue.price, |
||||||
|
executionType: dataFromValue.executionType, |
||||||
|
startTime: dataFromValue.startTime, |
||||||
|
}); |
||||||
|
} else { |
||||||
|
for (const storeId of this.dataFrom.value.merStoreIdArray) { |
||||||
|
dataArray.push({ |
||||||
|
merStoreId: storeId, |
||||||
|
oilNo: dataFromValue.oilNo, |
||||||
|
priceType: dataFromValue.priceType, |
||||||
|
price: dataFromValue.price, |
||||||
|
executionType: dataFromValue.executionType, |
||||||
|
startTime: dataFromValue.startTime, |
||||||
|
}); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
this.btnLoading = true; |
||||||
|
this.oilPriceTaskService.batchAddTask(dataArray, data => { |
||||||
|
if (data['return_code'] === '000000') { |
||||||
|
this.modal.success({ |
||||||
|
nzTitle: '提示', |
||||||
|
nzContent: '添加成功', |
||||||
|
nzOnOk: () => this.router.navigateByUrl('admin/gas-oil-price/task-list') |
||||||
|
}); |
||||||
|
} else { |
||||||
|
this.modal.error({ |
||||||
|
nzTitle: '提示', |
||||||
|
nzContent: data['return_msg'], |
||||||
|
}); |
||||||
|
} |
||||||
|
this.btnLoading = false; |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,169 @@ |
|||||||
|
<!-- 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" *ngIf="this.secUserObjectType !== 3"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="8">区域名称</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="14"> |
||||||
|
<input nz-input formControlName="regionName" /> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col nzSpan="8" *ngIf="this.secUserObjectType !== 3"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="8">油站编号</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="14"> |
||||||
|
<input nz-input formControlName="merStoreKey" /> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
|
||||||
|
<div nz-col nzSpan="8" *ngIf="this.secUserObjectType !== 3"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="8">油站名称</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="14"> |
||||||
|
<input nz-input formControlName="merStoreName" /> |
||||||
|
</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="oilNo"> |
||||||
|
<nz-option *ngFor="let item of oilNoArray" nzLabel="{{item.codeName}}" nzValue="{{item.codeValue}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</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="oilType"> |
||||||
|
<nz-option nzLabel="汽油" nzValue="1"></nz-option> |
||||||
|
<nz-option nzLabel="柴油" nzValue="2"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</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="priceType"> |
||||||
|
<nz-option *ngFor="let item of priceTypeArray" nzLabel="{{item.codeName}}" nzValue="{{item.codeValue}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</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="executionType"> |
||||||
|
<nz-option nzLabel="立刻执行" nzValue="1"></nz-option> |
||||||
|
<nz-option nzLabel="定时执行" nzValue="2"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</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="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" [routerLink]="['/admin/gas-oil-price/task-edit']" ><i nz-icon nzType="plus" nzTheme="outline"></i>创建任务</button> |
||||||
|
</div> |
||||||
|
|
||||||
|
<!--数组表格 --> |
||||||
|
<nz-table #basicTable |
||||||
|
[nzData]="dataObject.list" |
||||||
|
[nzTotal]="dataObject.total" |
||||||
|
[nzFrontPagination]="false" |
||||||
|
[nzLoading]="tableLoading" |
||||||
|
[nzPageIndex]="whereObject.pageNum" |
||||||
|
(nzPageIndexChange)="requestData($event)" |
||||||
|
[nzScroll]="{ x: '1100px'}"> |
||||||
|
<thead> |
||||||
|
<tr> |
||||||
|
<th nzWidth="60px">序号</th> |
||||||
|
<th nzWidth="100px" *ngIf="this.secUserObjectType !== 3">区域名称</th> |
||||||
|
<th nzWidth="100px" *ngIf="this.secUserObjectType !== 3">油站编号</th> |
||||||
|
<th nzWidth="200px" *ngIf="this.secUserObjectType !== 3">油站名称</th> |
||||||
|
<th nzWidth="80px">油品号</th> |
||||||
|
<th nzWidth="90px">油品类型</th> |
||||||
|
<th nzWidth="90px">价格类型</th> |
||||||
|
<th nzWidth="90px">执行价格</th> |
||||||
|
<th nzWidth="90px">执行方式</th> |
||||||
|
<th nzWidth="160px">执行时间</th> |
||||||
|
<th nzWidth="90px">任务状态</th> |
||||||
|
<th nzWidth="160px">创建时间</th> |
||||||
|
<th nzWidth="120px">创建人</th> |
||||||
|
<th nzWidth="110px" nzRight="0px">操作</th> |
||||||
|
</tr> |
||||||
|
</thead> |
||||||
|
<tbody> |
||||||
|
<tr *ngFor="let data of basicTable.data;let i = index"> |
||||||
|
<td>{{i+1}}</td> |
||||||
|
<td *ngIf="this.secUserObjectType !== 3">{{data.regionName}}</td> |
||||||
|
<td *ngIf="this.secUserObjectType !== 3">{{data.merStoreKey?data.merStoreKey:'无'}}</td> |
||||||
|
<td *ngIf="this.secUserObjectType !== 3">{{data.merStoreName?data.merStoreName:'无'}}</td> |
||||||
|
<td>{{data.oilNo}}</td> |
||||||
|
<td>{{data.oilTypeName}}</td> |
||||||
|
<td>{{data.priceType | oilPriceTaskPriceType}}</td> |
||||||
|
<td>¥{{data.price}}</td> |
||||||
|
<td>{{data.executionType | oilPriceTaskExecutionType}}</td> |
||||||
|
<td>{{data.startTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td> |
||||||
|
<td>{{data.status | oilPriceTaskStatus}}</td> |
||||||
|
<td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td> |
||||||
|
<td>{{data.opUserName}}</td> |
||||||
|
<td nzRight="0px" class="table-td-operation"> |
||||||
|
<a nz-dropdown [nzDropdownMenu]="menu"> 操作列表 <i nz-icon nzType="down"></i> </a> |
||||||
|
<nz-dropdown-menu #menu="nzDropdownMenu"> |
||||||
|
<ul nz-menu nzSelectable> |
||||||
|
<li nz-menu-item *ngIf="data.status == 1" (click)="showDelConfirm(data.id)"><a>删除任务</a></li> |
||||||
|
<li nz-menu-item *ngIf="data.status != 1" nzDisabled>暂无操作</li> |
||||||
|
</ul> |
||||||
|
</nz-dropdown-menu> |
||||||
|
</td> |
||||||
|
</tr> |
||||||
|
</tbody> |
||||||
|
</nz-table> |
||||||
|
</div> |
||||||
|
</nz-spin> |
||||||
|
|
@ -0,0 +1,25 @@ |
|||||||
|
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; |
||||||
|
|
||||||
|
import { OilPriceTaskListComponent } from './oil-price-task-list.component'; |
||||||
|
|
||||||
|
describe('OilPriceTaskListComponent', () => { |
||||||
|
let component: OilPriceTaskListComponent; |
||||||
|
let fixture: ComponentFixture<OilPriceTaskListComponent>; |
||||||
|
|
||||||
|
beforeEach(async(() => { |
||||||
|
TestBed.configureTestingModule({ |
||||||
|
declarations: [ OilPriceTaskListComponent ] |
||||||
|
}) |
||||||
|
.compileComponents(); |
||||||
|
})); |
||||||
|
|
||||||
|
beforeEach(() => { |
||||||
|
fixture = TestBed.createComponent(OilPriceTaskListComponent); |
||||||
|
component = fixture.componentInstance; |
||||||
|
fixture.detectChanges(); |
||||||
|
}); |
||||||
|
|
||||||
|
it('should create', () => { |
||||||
|
expect(component).toBeTruthy(); |
||||||
|
}); |
||||||
|
}); |
@ -0,0 +1,140 @@ |
|||||||
|
import { Component, OnInit } from '@angular/core'; |
||||||
|
import {environment} from '../../../../environments/environment'; |
||||||
|
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms'; |
||||||
|
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd'; |
||||||
|
import {LocalStorageService} from '../../../services/local-storage.service'; |
||||||
|
import {CommonsService} from '../../../services/commons.service'; |
||||||
|
import {Router} from '_@angular_router@9.0.7@@angular/router'; |
||||||
|
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace'; |
||||||
|
import {OilPriceTaskService} from '../../../services/oil-price/oil-price-task.service'; |
||||||
|
|
||||||
|
@Component({ |
||||||
|
selector: 'app-oil-price-task-list', |
||||||
|
templateUrl: './oil-price-task-list.component.html', |
||||||
|
styleUrls: ['./oil-price-task-list.component.scss'] |
||||||
|
}) |
||||||
|
export class OilPriceTaskListComponent implements OnInit { |
||||||
|
FILE_URL = environment.imageUrl; |
||||||
|
roleType; |
||||||
|
adminFlag; |
||||||
|
loadingObject = { |
||||||
|
spinning: false, |
||||||
|
msg: '加载中' |
||||||
|
}; |
||||||
|
|
||||||
|
dataObject: any = {}; |
||||||
|
tableLoading = true; |
||||||
|
searchForm: FormGroup; |
||||||
|
pageNum: number; |
||||||
|
whereObject: any = {}; |
||||||
|
|
||||||
|
oilNoArray = []; |
||||||
|
priceTypeArray = []; |
||||||
|
secUserObjectType: number; |
||||||
|
|
||||||
|
constructor(private modal: NzModalService, |
||||||
|
private message: NzMessageService, |
||||||
|
private store: LocalStorageService, |
||||||
|
private oilPriceTaskService: OilPriceTaskService, |
||||||
|
private localStorageService: LocalStorageService , // 请求缓存
|
||||||
|
private commonsService: CommonsService, |
||||||
|
private router: Router, |
||||||
|
private form: FormBuilder) { |
||||||
|
this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType); |
||||||
|
this.adminFlag = Number(this.store.get(ADMIN_INFO_OBJECT)['secUser'].adminFlag); |
||||||
|
this.secUserObjectType = Number(this.localStorageService.get(ADMIN_INFO_OBJECT)['secUser']['objectType']); |
||||||
|
} |
||||||
|
|
||||||
|
ngOnInit(): void { |
||||||
|
this.searchForm = this.form.group({ |
||||||
|
regionName: [null], |
||||||
|
merStoreKey: [null], |
||||||
|
merStoreName: [null], |
||||||
|
oilNo: [null], |
||||||
|
oilType: [null], |
||||||
|
priceType: [null], |
||||||
|
executionType: [null], |
||||||
|
status: [null], |
||||||
|
}); |
||||||
|
|
||||||
|
this.commonsService.getDictionary('GAS_OIL_TYPE', data => { |
||||||
|
this.oilNoArray = data['return_data']; |
||||||
|
}); |
||||||
|
|
||||||
|
// 管理员 、分公司
|
||||||
|
if (this.secUserObjectType === 0 || this.secUserObjectType === 1) { |
||||||
|
// 价格类型 1. 国标价 2. 油站价 3. 优惠幅度
|
||||||
|
this.priceTypeArray.push({codeValue: 1, codeName: '国标价'}); |
||||||
|
this.priceTypeArray.push({codeValue: 2, codeName: '油站价'}); |
||||||
|
this.priceTypeArray.push({codeValue: 3, codeName: '优惠幅度'}); |
||||||
|
} else { |
||||||
|
this.priceTypeArray.push({codeValue: 2, codeName: '油站价'}); |
||||||
|
this.priceTypeArray.push({codeValue: 3, codeName: '优惠幅度'}); |
||||||
|
} |
||||||
|
this.requestData(1); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 请求数据 |
||||||
|
*/ |
||||||
|
requestData(pageNum) { |
||||||
|
this.tableLoading = true; |
||||||
|
this.whereObject['pageNum'] = pageNum; |
||||||
|
this.whereObject['pageSize'] = 10; |
||||||
|
this.oilPriceTaskService.getTaskList(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(); |
||||||
|
} |
||||||
|
|
||||||
|
|
||||||
|
/** |
||||||
|
* 弹出删除对话框 |
||||||
|
*/ |
||||||
|
showDelConfirm(id: number): void { |
||||||
|
this.modal.confirm({ |
||||||
|
nzTitle: '警告', |
||||||
|
nzContent: '是否删除任务?任务一旦被删除,不会执行。', |
||||||
|
nzOkText: '是', |
||||||
|
nzCancelText: '否', |
||||||
|
nzOkType: 'danger', |
||||||
|
nzOnOk: () => this.delData(id) |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 禁用数据 |
||||||
|
*/ |
||||||
|
delData(id: number) { |
||||||
|
this.oilPriceTaskService.delTask(id, data => { |
||||||
|
if (data['return_code'] === '000000') { |
||||||
|
this.requestData(this.whereObject['pageNum']); |
||||||
|
} else { |
||||||
|
this.modal.error({ |
||||||
|
nzTitle: '提示', |
||||||
|
nzContent: data['return_msg'] |
||||||
|
}); |
||||||
|
} |
||||||
|
}); |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,17 @@ |
|||||||
|
import { Pipe, PipeTransform } from '@angular/core'; |
||||||
|
|
||||||
|
@Pipe({ |
||||||
|
name: 'oilPriceTaskExecutionType' |
||||||
|
}) |
||||||
|
export class OilPriceTaskExecutionTypePipe implements PipeTransform { |
||||||
|
|
||||||
|
transform(value: number): string { |
||||||
|
switch (value) { |
||||||
|
case 1: |
||||||
|
return '立刻执行'; |
||||||
|
case 2: |
||||||
|
return '定时执行'; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,19 @@ |
|||||||
|
import { Pipe, PipeTransform } from '@angular/core'; |
||||||
|
|
||||||
|
@Pipe({ |
||||||
|
name: 'oilPriceTaskPriceType' |
||||||
|
}) |
||||||
|
export class OilPriceTaskPriceTypePipe implements PipeTransform { |
||||||
|
|
||||||
|
transform(value: number): string { |
||||||
|
switch (value) { |
||||||
|
case 1: |
||||||
|
return '国标价'; |
||||||
|
case 2: |
||||||
|
return '油站价'; |
||||||
|
case 3: |
||||||
|
return '优惠幅度'; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,17 @@ |
|||||||
|
import { Pipe, PipeTransform } from '@angular/core'; |
||||||
|
|
||||||
|
@Pipe({ |
||||||
|
name: 'oilPriceTaskStatus' |
||||||
|
}) |
||||||
|
export class OilPriceTaskStatusPipe implements PipeTransform { |
||||||
|
|
||||||
|
transform(value: number): string { |
||||||
|
switch (value) { |
||||||
|
case 1: |
||||||
|
return '等待中'; |
||||||
|
case 2: |
||||||
|
return '已执行'; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
} |
@ -0,0 +1,64 @@ |
|||||||
|
import { Injectable } from '@angular/core'; |
||||||
|
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http'; |
||||||
|
import {CommonsService} from '../commons.service'; |
||||||
|
import {environment} from '../../../environments/environment'; |
||||||
|
|
||||||
|
@Injectable({ |
||||||
|
providedIn: 'root' |
||||||
|
}) |
||||||
|
export class OilPriceTaskService { |
||||||
|
|
||||||
|
constructor( |
||||||
|
private http: HttpClient, |
||||||
|
private common: CommonsService |
||||||
|
) { } |
||||||
|
|
||||||
|
|
||||||
|
/** |
||||||
|
* 批量增加任务 |
||||||
|
* |
||||||
|
* @param paramsObject 对象 |
||||||
|
* @param callBack 回调 |
||||||
|
*/ |
||||||
|
public batchAddTask(paramsObject: object, callBack) { |
||||||
|
this.http.post(environment.baseUrl + 'gasOilPriceTask/batchAddTask', paramsObject).subscribe(data => { |
||||||
|
callBack(data); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 删除任务 |
||||||
|
* |
||||||
|
* @param id 任务id |
||||||
|
* @param callBack 回调 |
||||||
|
*/ |
||||||
|
public delTask(id: number, callBack) { |
||||||
|
this.http.post(environment.baseUrl + 'gasOilPriceTask/delTask', { taskId: id }).subscribe(data => { |
||||||
|
callBack(data); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 批量增加任务 |
||||||
|
* |
||||||
|
* @param paramsObject 对象 |
||||||
|
* @param callBack 回调 |
||||||
|
*/ |
||||||
|
public getTaskDetail(id: number, callBack) { |
||||||
|
this.http.get(environment.baseUrl + 'gasOilPriceTask/getTaskDetail?taskId=' + id).subscribe(data => { |
||||||
|
callBack(data); |
||||||
|
}); |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* 批量增加任务 |
||||||
|
* |
||||||
|
* @param paramsObject 对象 |
||||||
|
* @param callBack 回调 |
||||||
|
*/ |
||||||
|
public getTaskList(param: object, callBack) { |
||||||
|
this.http.get(environment.baseUrl + 'gasOilPriceTask/getTaskList?' + this.common.getWhereCondition(param)).subscribe(data => { |
||||||
|
callBack(data); |
||||||
|
}); |
||||||
|
} |
||||||
|
} |
Loading…
Reference in new issue