commit
6fa3f5b9c2
@ -1 +1,143 @@ |
|||||||
<p>order-st works!</p> |
<!-- start 面包屑 --> |
||||||
|
<nz-breadcrumb> |
||||||
|
<nz-breadcrumb-item> |
||||||
|
团油订单统计 |
||||||
|
</nz-breadcrumb-item> |
||||||
|
</nz-breadcrumb> |
||||||
|
<!-- end 面包屑 --> |
||||||
|
|
||||||
|
<!--条件搜索--> |
||||||
|
<!--条件搜索--> |
||||||
|
<div class="inner-content"> |
||||||
|
<form nz-form [formGroup]="searchForm" (ngSubmit)="getRequest(true , searchForm.value)"> |
||||||
|
<div nz-row> |
||||||
|
<div nz-col nzSpan="8"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="6">时间区间</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="16"> |
||||||
|
<nz-range-picker [nzShowTime]="{ nzFormat: 'HH:mm' }" formControlName="createTime"></nz-range-picker> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="8" *ngIf="roleType == 5 && adminFlag == 1"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="6">部门</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="16"> |
||||||
|
<nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择选择部门" formControlName="organizationId" (ngModelChange)="getAgentList($event)"> |
||||||
|
<nz-option *ngFor="let item of companyData" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="8" *ngIf="roleType == 5"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="6">代理商</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="16"> |
||||||
|
<nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择代理商" formControlName="agentId" (ngModelChange)="getSalesmanList($event)"> |
||||||
|
<nz-option *ngFor="let item of agentData" nzValue="{{item.id}}" nzLabel="{{item.agentName}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="8" *ngIf="roleType == 5 || roleType == 8"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="6">业务员</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="16"> |
||||||
|
<nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择业务员" formControlName="gasSalesmanId" (ngModelChange)="getSalesmanList($event)"> |
||||||
|
<nz-option *ngFor="let item of salesmanData" nzValue="{{item.id}}" nzLabel="{{item.salesmanName}}"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="8"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="6">支付类型</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="16"> |
||||||
|
<nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择支付类型" formControlName="payType" > |
||||||
|
<nz-option nzValue="1" nzLabel="支付宝"></nz-option> |
||||||
|
<nz-option nzValue="2" nzLabel="微信"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="8"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="6">油号</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="16"> |
||||||
|
<nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择油号" formControlName="gasOilNo" > |
||||||
|
<nz-option nzValue="0" nzLabel="0"></nz-option> |
||||||
|
<nz-option nzValue="92" nzLabel="92"></nz-option> |
||||||
|
<nz-option nzValue="95" nzLabel="95"></nz-option> |
||||||
|
<nz-option nzValue="98" nzLabel="98"></nz-option> |
||||||
|
</nz-select> |
||||||
|
</nz-form-control> |
||||||
|
</nz-form-item> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="8"> |
||||||
|
<nz-form-item> |
||||||
|
<nz-form-label [nzSpan]="6">油品类型</nz-form-label> |
||||||
|
<nz-form-control [nzSpan]="16"> |
||||||
|
<nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择油品类型" formControlName="gasOilType" > |
||||||
|
<nz-option nzValue="1" nzLabel="汽油"></nz-option> |
||||||
|
<nz-option nzValue="2" nzLabel="柴油"></nz-option> |
||||||
|
<nz-option nzValue="3" nzLabel="天然气"></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" > |
||||||
|
|
||||||
|
<div nz-row style="margin-top: 20px;" [nzGutter]="16"> |
||||||
|
<div nz-col nzSpan="6"> |
||||||
|
<nz-card nzHoverable [nzLoading]="loading"> |
||||||
|
<p>团油订单金额(元)</p> |
||||||
|
<h2>¥{{requestData['orderPrice'] == null ? 0 :requestData['orderPrice']}}</h2> |
||||||
|
</nz-card> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="6"> |
||||||
|
<nz-card nzHoverable [nzLoading]="loading"> |
||||||
|
<p>团油交易金额(元)</p> |
||||||
|
<h2>¥{{requestData['tradePrice'] == null ? 0 :requestData['tradePrice']}}</h2> |
||||||
|
</nz-card> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="6"> |
||||||
|
<nz-card nzHoverable [nzLoading]="loading"> |
||||||
|
<p>团油优惠金额(元)</p> |
||||||
|
<h2>¥{{requestData['discountedPrice'] == null ? 0 :requestData['discountedPrice']}}</h2> |
||||||
|
</nz-card> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="6"> |
||||||
|
<nz-card nzHoverable [nzLoading]="loading"> |
||||||
|
<p>团油订单数量(笔)</p> |
||||||
|
<h2>{{requestData['orderNum'] == null ? 0 :requestData['orderNum']}}</h2> |
||||||
|
</nz-card> |
||||||
|
</div> |
||||||
|
|
||||||
|
</div> |
||||||
|
<div nz-row style="margin-top: 20px;" [nzGutter]="16"> |
||||||
|
<div nz-col nzSpan="8"> |
||||||
|
<div style="margin-top: 20px" echarts [options]="priceData"></div> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="8"> |
||||||
|
<div style="margin-top: 20px" echarts [options]="payTypeData"></div> |
||||||
|
</div> |
||||||
|
<div nz-col nzSpan="8"> |
||||||
|
<div style="margin-top: 20px" echarts [options]="gasOilNoData"></div> |
||||||
|
</div> |
||||||
|
|
||||||
|
</div> |
||||||
|
</div> |
||||||
|
|
||||||
|
@ -1,25 +0,0 @@ |
|||||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing'; |
|
||||||
|
|
||||||
import { OrderStComponent } from './order-st.component'; |
|
||||||
|
|
||||||
describe('OrderStComponent', () => { |
|
||||||
let component: OrderStComponent; |
|
||||||
let fixture: ComponentFixture<OrderStComponent>; |
|
||||||
|
|
||||||
beforeEach(async(() => { |
|
||||||
TestBed.configureTestingModule({ |
|
||||||
declarations: [ OrderStComponent ] |
|
||||||
}) |
|
||||||
.compileComponents(); |
|
||||||
})); |
|
||||||
|
|
||||||
beforeEach(() => { |
|
||||||
fixture = TestBed.createComponent(OrderStComponent); |
|
||||||
component = fixture.componentInstance; |
|
||||||
fixture.detectChanges(); |
|
||||||
}); |
|
||||||
|
|
||||||
it('should create', () => { |
|
||||||
expect(component).toBeTruthy(); |
|
||||||
}); |
|
||||||
}); |
|
Loading…
Reference in new issue