提交代码

src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html

@@ -10,7 +10,7 @@
 
                 <div nz-col nzSpan="8">
                     <nz-form-item>
-                        <nz-form-label [nzSpan]="8">订单号</nz-form-label>
+                        <nz-form-label [nzSpan]="8">交易单号</nz-form-label>
                         <nz-form-control [nzSpan]="14">
                             <input nz-input formControlName="orderNo" />
                         </nz-form-control>
@@ -34,7 +34,9 @@
                         </nz-form-control>
                     </nz-form-item>
                 </div>
+            </div>
 
+            <div nz-row *ngIf="isCollapse">
                 <div nz-col nzSpan="8">
                     <nz-form-item>
                         <nz-form-label [nzSpan]="8">支付卡号</nz-form-label>
@@ -75,8 +77,7 @@
                         </nz-form-control>
                     </nz-form-item>
                 </div>
-            </div>
+
-            <div nz-row *ngIf="isCollapse">
                 <div nz-col nzSpan="8">
                     <nz-form-item>
                         <nz-form-label [nzSpan]="8">创建时间</nz-form-label>
@@ -123,16 +124,20 @@
 
         <!--数组表格 -->
         <nz-table #basicTable
+                  nzShowPagination
+                  nzShowSizeChanger
+                  nzBordered
                   [nzData]="dataObject.list"
                   [nzTotal]="dataObject.total"
                   [nzFrontPagination]="false"
                   [nzLoading]="tableLoading"
                   [nzPageIndex]="whereObject.pageNum"
                   (nzPageIndexChange)="requestData($event)"
+                  (nzPageSizeChange)="pageSizeChang($event)"
+                  [nzPageSizeOptions]="[10,20,50,100]"
                   [nzScroll]="{ x: '1100px'}">
             <thead>
             <tr>
-                <th nzWidth="60px">序号</th>
                 <th nzWidth="200px">交易单号</th>
                 <th nzWidth="120px">客户电话</th>
                 <th nzWidth="200px">卡券名称</th>
@@ -153,7 +158,6 @@
             </thead>
             <tbody>
             <tr *ngFor="let data of basicTable.data;let i = index">
-                <td>{{i+1}}</td>
                 <td>{{data.orderNo}}</td>
                 <td>{{data.memPhone}}</td>
                 <td>{{data.couponName}}</td>

src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts

@@ -27,7 +27,8 @@ export class OrderCouponListComponent implements OnInit {
   dataObject: any = {};
   tableLoading = true;
   searchForm: FormGroup;
-  pageNum: number;
+  pageNum = 1;
+  pageSize =  10;
   whereObject: any = {};
   isCollapse = false;
 
@@ -73,7 +74,7 @@ export class OrderCouponListComponent implements OnInit {
   requestData(pageNum) {
     this.tableLoading = true;
     this.whereObject['pageNum'] = pageNum;
-    this.whereObject['pageSize'] = 10;
+    this.whereObject['pageSize'] = this.pageSize;
     this.orderCouponService.getOrderList(this.whereObject, data => {
       if (data['return_code'] === '000000') {
         this.dataObject = data['return_data'];
@@ -171,4 +172,13 @@ export class OrderCouponListComponent implements OnInit {
       }
     });
   }
+
+  /**
+   * 分页
+   * @param pageSize
+   */
+  pageSizeChang(pageSize: number) {
+    this.pageSize = pageSize;
+    this.requestData(1)
+  }
 }

src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html

@@ -95,16 +95,20 @@
 
         <!--数组表格 -->
         <nz-table #basicTable
+                  nzShowPagination
+                  nzShowSizeChanger
+                  nzBordered
                   [nzData]="dataObject.list"
                   [nzTotal]="dataObject.total"
                   [nzFrontPagination]="false"
                   [nzLoading]="tableLoading"
                   [nzPageIndex]="whereObject.pageNum"
                   (nzPageIndexChange)="requestData($event)"
+                  (nzPageSizeChange)="pageSizeChang($event)"
+                  [nzPageSizeOptions]="[10,20,50,100]"
                   [nzScroll]="{ x: '1100px'}">
             <thead>
             <tr>
-                <th nzWidth="60px">序号</th>
                 <th nzWidth="200px">交易单号</th>
                 <th nzWidth="120px">客户电话</th>
                 <th nzWidth="100px">充值积分</th>
@@ -121,7 +125,6 @@
             </thead>
             <tbody>
             <tr *ngFor="let data of basicTable.data;let i = index">
-                <td>{{i+1}}</td>
                 <td>{{data.orderNo}}</td>
                 <td>{{data.memPhone}}</td>
                 <td>{{data.goodsPrice}}</td>

src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.ts

@@ -27,7 +27,8 @@ export class OrderIntegralRechargeComponent implements OnInit {
   dataObject: any = {};
   tableLoading = true;
   searchForm: FormGroup;
-  pageNum: number;
+  pageNum = 1;
+  pageSize =  10;
   whereObject: any = {};
   isCollapse = false;
 
@@ -71,7 +72,7 @@ export class OrderIntegralRechargeComponent implements OnInit {
   requestData(pageNum) {
     this.tableLoading = true;
     this.whereObject['pageNum'] = pageNum;
-    this.whereObject['pageSize'] = 10;
+    this.whereObject['pageSize'] = this.pageSize;
     this.orderIntegralRechargeService.getOrderList(this.whereObject, data => {
       if (data['return_code'] === '000000') {
         this.dataObject = data['return_data'];
@@ -170,4 +171,13 @@ export class OrderIntegralRechargeComponent implements OnInit {
     });
   }
 
+  /**
+   * 分页
+   * @param pageSize
+   */
+  pageSizeChang(pageSize: number) {
+    this.pageSize = pageSize;
+    this.requestData(1)
+  }
+
 }

src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html

@@ -9,29 +9,44 @@
         <form nz-form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)">
             <div nz-row>
 
-                <div nz-col nzSpan="8" *ngIf="roleType != 3 && roleType != 10">
+                <div nz-col nzSpan="8">
                     <nz-form-item>
-                        <nz-form-label [nzSpan]="8">加油站</nz-form-label>
+                        <nz-form-label [nzSpan]="8">交易单号</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <input nz-input formControlName="storeName" />
+                            <input nz-input formControlName="orderNo" />
                         </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-label [nzSpan]="8">客户电话</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <input nz-input formControlName="orderNo" />
+                            <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-label [nzSpan]="8">油号</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <input nz-input formControlName="memPhone" />
+                            <nz-select formControlName="gasOilNo" nzAllowClear>
+                                <nz-option *ngFor="let item of oilArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+                            </nz-select>
+                        </nz-form-control>
+                    </nz-form-item>
+                </div>
+
+            </div>
+
+            <div nz-row *ngIf="isCollapse">
+
+                <div nz-col nzSpan="8" *ngIf="roleType != 3 && roleType != 10">
+                    <nz-form-item>
+                        <nz-form-label [nzSpan]="8">加油站</nz-form-label>
+                        <nz-form-control [nzSpan]="14">
+                            <input nz-input formControlName="storeName" />
                         </nz-form-control>
                     </nz-form-item>
                 </div>
@@ -60,21 +75,6 @@
                     </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-select formControlName="gasOilNo" nzAllowClear>
-                                <nz-option *ngFor="let item of oilArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
-                            </nz-select>
-                        </nz-form-control>
-                    </nz-form-item>
-                </div>
-            </div>
-
-            <div nz-row *ngIf="isCollapse">
-
                 <div nz-col nzSpan="8" *ngIf="roleType != 10">
                     <nz-form-item>
                         <nz-form-label [nzSpan]="8">加油员</nz-form-label>
@@ -200,10 +200,10 @@
         >
             <thead>
             <tr>
-                <th rowspan="2" nzWidth="200px">交易订单号</th>
+                <th rowspan="2" nzWidth="200px">交易单号</th>
+                <th rowspan="2" nzWidth="120px">客户电话</th>
                 <th rowspan="2" *ngIf="roleType != 3 && roleType != 10" nzWidth="200px">加油站</th>
                 <th rowspan="2" *ngIf="roleType != 10" nzWidth="120px">加油员</th>
-                <th rowspan="2" nzWidth="120px">客户手机号</th>
                 <th colspan="9">加油信息</th>
                 <th colspan="5">支付信息</th>
                 <th rowspan="2">交易状态</th>
@@ -238,9 +238,9 @@
             <tbody>
             <tr *ngFor="let data of basicTable.data;let i = index">
                 <td>{{data.orderNo}}</td>
+                <td>{{data.memPhone}}</td>
                 <td *ngIf="roleType != 3 && roleType != 10">{{data.storeName}}</td>
                 <td *ngIf="roleType != 10">{{data.gasStaffName?data.gasStaffName:'未知'}}</td>
-                <td>{{data.memPhone}}</td>
                 <td>{{data.gasRefuelPrice}}元</td>
                 <td>{{data.gasOilLiters}}升</td>
                 <td>{{data.gasOilNo}}#</td>