提交代码

pull/1/head
胡锐 2 years ago
parent 36bce39937
commit 99f4cf4cbd
  1. 1
      src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html
  2. 0
      src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.scss
  3. 25
      src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.spec.ts
  4. 15
      src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts
  5. 4
      src/app/admin/order-manage/order-manage-routing.module.ts
  6. 3
      src/app/admin/order-manage/order-manage.module.ts
  7. 2
      src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html
  8. 6
      src/app/services/order-manage.service.ts

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderCouponListComponent } from './order-coupon-list.component';
describe('OrderCouponListComponent', () => {
let component: OrderCouponListComponent;
let fixture: ComponentFixture<OrderCouponListComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ OrderCouponListComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(OrderCouponListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'app-order-coupon-list',
templateUrl: './order-coupon-list.component.html',
styleUrls: ['./order-coupon-list.component.scss']
})
export class OrderCouponListComponent implements OnInit {
constructor() { }
ngOnInit(): void {
}
}

@ -1,10 +1,12 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import {OrderOilListComponent} from './order-oil/order-oil-list/order-oil-list.component'; import {OrderOilListComponent} from './order-oil/order-oil-list/order-oil-list.component';
import {OrderCouponListComponent} from './order-coupon/order-coupon-list/order-coupon-list.component';
const routes: Routes = [ const routes: Routes = [
{ path: 'order-oil-list', component: OrderOilListComponent} { path: 'order-oil-list', component: OrderOilListComponent },
{ path: 'order-coupon-list', component: OrderCouponListComponent }
]; ];
@NgModule({ @NgModule({

@ -7,10 +7,11 @@ import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms'; import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module'; import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {AppCommonModule} from '../../app-common.module'; import {AppCommonModule} from '../../app-common.module';
import { OrderCouponListComponent } from './order-coupon/order-coupon-list/order-coupon-list.component';
@NgModule({ @NgModule({
declarations: [OrderOilListComponent], declarations: [OrderOilListComponent, OrderCouponListComponent],
imports: [ imports: [
CommonModule, CommonModule,
OrderManageRoutingModule, OrderManageRoutingModule,

@ -180,7 +180,7 @@
<div class="inner-content"> <div class="inner-content">
<span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span> <span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span>
<div class="operating-button"> <div class="operating-button">
<button nz-button nzType="primary" class="right-btn" (click)="excelOrder()"><i nz-icon nzType="plus" nzTheme="outline"></i>导出订单</button> <button nz-button nzType="primary" class="right-btn" (click)="excelOrder()"><i nz-icon nzType="export" nzTheme="outline"></i>导出订单</button>
</div> </div>
<!--数组表格 --> <!--数组表格 -->

@ -34,7 +34,7 @@ export class OrderManageService {
* @param callBack * @param callBack
*/ */
public getGasOrderList(param: object, callBack) { public getGasOrderList(param: object, callBack) {
this.http.get(environment.orderUrl + 'bweb/getGasOrderList?' + this.common.getWhereCondition(param)).subscribe(data => { this.http.get(environment.orderUrl + 'oil/getOilOrderList?' + this.common.getWhereCondition(param)).subscribe(data => {
callBack(data); callBack(data);
}); });
} }
@ -46,7 +46,7 @@ export class OrderManageService {
* @param callBack * @param callBack
*/ */
public getGasOrderDetail(orderNo: string, callBack) { public getGasOrderDetail(orderNo: string, callBack) {
this.http.get(environment.orderUrl + 'bweb/getGasOrderDetail?orderNo=' + orderNo).subscribe(data => { this.http.get(environment.orderUrl + 'oil/getOilOrderDetail?orderNo=' + orderNo).subscribe(data => {
callBack(data); callBack(data);
}); });
} }
@ -58,7 +58,7 @@ export class OrderManageService {
* @param callBack * @param callBack
*/ */
public exportGasOrderList(param: object, callBack) { public exportGasOrderList(param: object, callBack) {
this.http.get(environment.orderUrl + 'bweb/exportGasOrder?' + this.common.getWhereCondition(param)).subscribe(data => { this.http.get(environment.orderUrl + 'oil/exportOilOrder?' + this.common.getWhereCondition(param)).subscribe(data => {
callBack(data); callBack(data);
}); });
} }

Loading…
Cancel
Save