From 4079fe6da4d85666c876b091a51c9e38d6d32c2c Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Mon, 11 Apr 2022 16:03:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ty-order-list.component.html              | 28 +++++++++++++++++--
 .../ty-order-list/ty-order-list.component.ts  | 10 +++++++
 2 files changed, 35 insertions(+), 3 deletions(-)

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 @@
                     </nz-form-control>
                 </nz-form-item>
             </div>
+            <div nz-col nzSpan="8" *ngIf="adminFlag == 1 && roleType == 5">
+                <nz-form-item>
+                    <nz-form-label [nzSpan]="8">用户手机号</nz-form-label>
+                    <nz-form-control [nzSpan]="14">
+                        <input nz-input formControlName="memPhone" />
+                    </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-range-picker
+                                [nzShowTime]="{ nzHideDisabledOptions: true }"
+                                formControlName="payTimeArray"
+                                nzFormat="yyyy-MM-dd HH:mm:ss"
+                        ></nz-range-picker>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
         </div>
 
         <div nz-row>
@@ -78,6 +98,7 @@
             <th nzWidth="120px" *ngIf="roleType == 5">代理商</th>
             <th nzWidth="120px" *ngIf="roleType == 8 || roleType == 5">业务员</th>
             <th nzWidth="160px">加油站</th>
+            <th nzWidth="160px" *ngIf="adminFlag == 1 && roleType == 5">用户手机号</th>
             <th nzWidth="200px">订单号</th>
             <th nzWidth="100px">支付类型</th>
             <th nzWidth="100px">加油金额</th>
@@ -94,10 +115,11 @@
         </thead>
         <tbody>
         <tr *ngFor="let data of basicTable.data;let i = index">
-            <td *ngIf="adminFlag == 1 && roleType == 5">{{data.orgName}}</td>
-            <td *ngIf="roleType == 5">{{data.agentName}}</td>
-            <td *ngIf="roleType == 8 || roleType == 5">{{data.salesmanName}}</td>
+            <td *ngIf="adminFlag == 1 && roleType == 5">{{data.orgName?data.orgName:'无'}}</td>
+            <td *ngIf="roleType == 5">{{data.agentName?data.agentName:'无'}}</td>
+            <td *ngIf="roleType == 8 || roleType == 5">{{data.salesmanName?data.salesmanName:'无'}}</td>
             <td>{{data.goodsName}}</td>
+            <td *ngIf="adminFlag == 1 && roleType == 5">{{data.memPhone}}</td>
             <td>{{data.orderNo}}</td>
             <td>{{data.payType}}</td>
             <td>{{data.totalPrice}}元</td>
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);
   }