diff --git a/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html b/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html index 780744a..6b6da52 100644 --- a/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html +++ b/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.html @@ -46,6 +46,26 @@ +
+ + 用户手机号 + + + + +
+
+ + 支付时间 + + + + +
@@ -78,6 +98,7 @@ 代理商 业务员 加油站 + 用户手机号 订单号 支付类型 加油金额 @@ -94,10 +115,11 @@ - {{data.orgName}} - {{data.agentName}} - {{data.salesmanName}} + {{data.orgName?data.orgName:'无'}} + {{data.agentName?data.agentName:'无'}} + {{data.salesmanName?data.salesmanName:'无'}} {{data.goodsName}} + {{data.memPhone}} {{data.orderNo}} {{data.payType}} {{data.totalPrice}}元 diff --git a/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts b/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts index e6a96d9..008e30c 100644 --- a/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts +++ b/src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts @@ -38,6 +38,8 @@ export class TyOrderListComponent implements OnInit { orgName: [null], agentName: [null], salesmanName: [null], + memPhone: [null], + payTimeArray: [null], }); this.requestData(1); } @@ -64,7 +66,15 @@ export class TyOrderListComponent implements OnInit { * @param whereObject 条件 */ search(whereObject: object) { + if (whereObject['payTimeArray'] != null) { + whereObject['payTimeS'] = new Date(whereObject['payTimeArray'][0]).getTime(); + whereObject['payTimeE'] = new Date(whereObject['payTimeArray'][1]).getTime(); + } else { + whereObject['payTimeS'] = null; + whereObject['payTimeE'] = null; + } this.whereObject = whereObject; + console.log(this.whereObject); this.requestData(1); }