diff --git a/src/app/admin/goods/goods.module.ts b/src/app/admin/goods/goods.module.ts index db97468..f011a5e 100644 --- a/src/app/admin/goods/goods.module.ts +++ b/src/app/admin/goods/goods.module.ts @@ -9,7 +9,7 @@ import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/f import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module'; import {RegionSelectorModule} from '../../common/region-selector/region-selector.module'; import {AppCommonModule} from '../../app-common.module'; -import {PreviewImageModule} from "../../common/preview-image/preview-image.module"; +import {PreviewImageModule} from '../../common/preview-image/preview-image.module'; @NgModule({ diff --git a/src/app/admin/order-manage/goods-order/goods-order.component.html b/src/app/admin/order-manage/goods-order/goods-order.component.html index bcf43f2..0f1247b 100644 --- a/src/app/admin/order-manage/goods-order/goods-order.component.html +++ b/src/app/admin/order-manage/goods-order/goods-order.component.html @@ -282,7 +282,7 @@ - +
diff --git a/src/app/admin/order-manage/order-manage-routing.module.ts b/src/app/admin/order-manage/order-manage-routing.module.ts index e63851b..75eede6 100644 --- a/src/app/admin/order-manage/order-manage-routing.module.ts +++ b/src/app/admin/order-manage/order-manage-routing.module.ts @@ -13,6 +13,7 @@ import {PreOrderComponent} from './pre-order/pre-order.component'; import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mobile-recharge-order-list.component'; import {HltChargeOrderComponent} from './hlt-charge-order/hlt-charge-order.component'; import {GoodsOrderComponent} from './goods-order/goods-order.component'; +import {GoodsChildOrderComponent} from './goods-child-order/goods-child-order.component'; const routes: Routes = [ @@ -29,6 +30,7 @@ const routes: Routes = [ { path: 'discount-package-order-list', component: DicountPackageOrderListComponent}, { path: 'hlt-order-list', component: HltChargeOrderComponent}, { path: 'goods-order', component: GoodsOrderComponent}, + { path: 'goods-child-order', component: GoodsChildOrderComponent}, ]; @NgModule({ diff --git a/src/app/admin/order-manage/order-manage.module.ts b/src/app/admin/order-manage/order-manage.module.ts index dace081..f22e652 100644 --- a/src/app/admin/order-manage/order-manage.module.ts +++ b/src/app/admin/order-manage/order-manage.module.ts @@ -23,9 +23,10 @@ import {MobileRechargeOrderListComponent} from './mobile-recharge-order-list/mob import { HltChargeOrderComponent } from './hlt-charge-order/hlt-charge-order.component'; import { GoodsOrderComponent } from './goods-order/goods-order.component'; import {PreviewImageModule} from "../../common/preview-image/preview-image.module"; +import { GoodsChildOrderComponent } from './goods-child-order/goods-child-order.component'; @NgModule({ - declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent, HltChargeOrderComponent, GoodsOrderComponent], + declarations: [OrderOilListComponent, OrderCouponListComponent, OrderIntegralRechargeComponent, OrderRefundListComponent, KfcOrderListComponent, StarbucksOrderListComponent, MemberChargeOrderListComponent, MobileRechargeOrderListComponent, PreOrderComponent,DicountPackageOrderListComponent, MemberChargeOrderListComponent, DiscountUseConditionListComponent, HltChargeOrderComponent, GoodsOrderComponent, GoodsChildOrderComponent], imports: [ CommonModule, OrderManageRoutingModule, diff --git a/src/app/services/goods/goods.service.ts b/src/app/services/goods/goods.service.ts index 28af65c..e7d881e 100644 --- a/src/app/services/goods/goods.service.ts +++ b/src/app/services/goods/goods.service.ts @@ -300,6 +300,13 @@ export class GoodsService { }); } + + public getOrderChildList(param: object, callBack) { + this.http.get(environment.orderUrl + 'goodsOrder/getOrderChildList?' + this.common.getWhereCondition(param)).subscribe(data => { + callBack(data); + }); + } + public updateLogisticsNo(param: object, callBack) { this.http.get(environment.orderUrl + 'goodsOrder/updateLogisticsNo?' + this.common.getWhereCondition(param)).subscribe(data => { callBack(data);