diff --git a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html
index 586a60a..e8dcdf7 100644
--- a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html
+++ b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.html
@@ -37,6 +37,38 @@
             </div>
 
             <div nz-row *ngIf="isCollapse">
+
+                <div nz-col nzSpan="8" *ngIf="roleType == 0 || roleType == 1">
+                    <nz-form-item>
+                        <nz-form-label [nzSpan]="8">分公司</nz-form-label>
+                        <nz-form-control [nzSpan]="14">
+                            <nz-select nzAllowClear formControlName="companyId">
+                                <nz-option *ngFor="let item of companyArray" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option>
+                            </nz-select>
+                        </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">
+                            <input nz-input formControlName="couponKey" />
+                        </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-select nzAllowClear formControlName="couponSource">
+                                <nz-option *ngFor="let item of couponSourceArray" nzValue="{{item.codeValue}}" nzLabel="{{item.codeName}}"></nz-option>
+                            </nz-select>
+                        </nz-form-control>
+                    </nz-form-item>
+                </div>
+
                 <div nz-col nzSpan="8">
                     <nz-form-item>
                         <nz-form-label [nzSpan]="8">支付卡号</nz-form-label>
@@ -67,7 +99,7 @@
                     <nz-form-item>
                         <nz-form-label [nzSpan]="8">订单状态</nz-form-label>
                         <nz-form-control [nzSpan]="14">
-                            <nz-select nzAllowClear formControlName="status">
+                            <nz-select nzAllowClear formControlName="orderStatus">
                                 <nz-option nzValue="1" nzLabel="待支付"></nz-option>
                                 <nz-option nzValue="2" nzLabel="已支付"></nz-option>
                                 <nz-option nzValue="3" nzLabel="已完成"></nz-option>
@@ -138,10 +170,13 @@
                   [nzScroll]="{ x: '1100px'}">
             <thead>
             <tr>
+                <th nzWidth="200px" *ngIf="roleType == 0 || roleType == 1">分公司</th>
                 <th nzWidth="200px">交易单号</th>
                 <th nzWidth="120px">客户电话</th>
+                <th nzWidth="150px">卡券编码</th>
                 <th nzWidth="200px">卡券名称</th>
                 <th nzWidth="100px">卡券面值</th>
+                <th nzWidth="140px">卡券来源</th>
                 <th nzWidth="100px">订单总额</th>
                 <th nzWidth="100px">总优惠</th>
                 <th nzWidth="110px">优惠券优惠</th>
@@ -160,10 +195,13 @@
             </thead>
             <tbody>
             <tr *ngFor="let data of basicTable.data;let i = index">
+                <td *ngIf="roleType == 0 || roleType == 1">{{data.companyName}}</td>
                 <td>{{data.orderNo}}</td>
                 <td>{{data.memPhone}}</td>
+                <td>{{data.couponKey}}</td>
                 <td>{{data.couponName}}</td>
                 <td>￥{{data.couponPrice}}</td>
+                <td>{{data.couponSource}}</td>
                 <td>￥{{data.totalPrice}}</td>
                 <td>￥{{data.totalDeductionPrice}}</td>
                 <td>￥{{data.deductionCouponPrice}}</td>
@@ -230,14 +268,8 @@
             <nz-tab nzTitle="交易时间">
                 <nz-card>
                     <nz-timeline>
-                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null">
-                            <p>创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
-                            <p>备注：{{orderDetailObject.tradeOrder.remarks?orderDetailObject.tradeOrder.remarks:'无'}}</p>
-                        </nz-timeline-item>
-                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">
-                            <p>取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
-                            <p>备注：{{orderDetailObject.tradeOrder.cancelRemarks?orderDetailObject.tradeOrder.cancelRemarks:'无'}}</p>
-                        </nz-timeline-item>
+                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null">创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
+                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.payTime != null">支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.finishTime != null">完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.refundTime != null">退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
@@ -245,21 +277,23 @@
                 </nz-card>
             </nz-tab>
             <nz-tab nzTitle="产品信息">
-                <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true">
+                <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true" [nzScroll]="{ x: '1000px'}">
                     <thead>
                     <tr>
+                        <th nzWidth="110px">订单编号</th>
                         <th nzWidth="60px">产品类型</th>
                         <th nzWidth="150px">产品名称</th>
                         <th nzWidth="80px">产品规格</th>
-                        <th nzWidth="20px">数量</th>
-                        <th nzWidth="20px">单价</th>
-                        <th nzWidth="20px">总价</th>
+                        <th nzWidth="60px">数量</th>
+                        <th nzWidth="60px">单价</th>
+                        <th nzWidth="60px">总价</th>
                     </tr>
                     </thead>
                     <tbody>
                     <tr *ngFor="let data of childOrder.data">
+                        <td>{{ data.childOrderNo}}</td>
                         <td>{{ data.goodsType | orderChildGoodsType}}</td>
-                        <td>
+                        <td nzEllipsis>
                             {{ data.goodsName }}
                             <nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag>
                         </td>
diff --git a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts
index 339841b..31c7934 100644
--- a/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts
+++ b/src/app/admin/order-manage/order-coupon/order-coupon-list/order-coupon-list.component.ts
@@ -8,6 +8,7 @@ import {ADMIN_INFO_OBJECT} from '../../../../services/local-storage.namespace';
 import {environment} from '../../../../../environments/environment';
 import {OrderManageService} from '../../../../services/order/order-manage.service';
 import {OrderCouponService} from '../../../../services/order/order-coupon.service';
+import {CompanyService} from '../../../../services/company.service';
 
 @Component({
   selector: 'app-order-coupon-list',
@@ -32,8 +33,6 @@ export class OrderCouponListComponent implements OnInit {
   whereObject: any = {};
   isCollapse = false;
 
-  positionTypeArray = [];
-
   orderDetailModal = false;
   orderDetailModalLoading = false;
   orderDetailObject: any = {
@@ -41,12 +40,16 @@ export class OrderCouponListComponent implements OnInit {
     gasOrder: {},
   };
 
+  couponSourceArray = [];
+  companyArray = [];
+
   constructor(private modal: NzModalService,
               private message: NzMessageService,
               private store: LocalStorageService,
               private orderManageService: OrderManageService,
               private orderCouponService: OrderCouponService,
               private commonsService: CommonsService,
+              private companyService: CompanyService,
               private router: Router,
               private form: FormBuilder) {
     this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType);
@@ -56,15 +59,26 @@ export class OrderCouponListComponent implements OnInit {
 
   ngOnInit(): void {
     this.searchForm = this.form.group({
+      companyId: [null],
       orderNo: [null],
       memPhone: [null],
+      couponKey: [null],
+      couponSource: [null],
       couponName: [null],
       payType: [null],
-      status: [null],
+      orderStatus: [null],
       createTime: [null],
       payTime: [null],
       finishTime: [null],
     });
+
+    this.companyService.selectCompanyList({pageNum: 1, pageSize: 100}, data => {
+        this.companyArray = data['return_data']['list'];
+    });
+    this.commonsService.getDictionary("COUPON_SOURCE", data => {
+      this.couponSourceArray = data['return_data'];
+    });
+
     this.requestData(1);
   }
 
diff --git a/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html b/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html
index 61246f6..44e901a 100644
--- a/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html
+++ b/src/app/admin/order-manage/order-integral-recharge/order-integral-recharge.component.html
@@ -185,14 +185,8 @@
             <nz-tab nzTitle="交易时间">
                 <nz-card>
                     <nz-timeline>
-                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null">
-                            <p>创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
-                            <p>备注：{{orderDetailObject.tradeOrder.remarks?orderDetailObject.tradeOrder.remarks:'无'}}</p>
-                        </nz-timeline-item>
-                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">
-                            <p>取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
-                            <p>备注：{{orderDetailObject.tradeOrder.cancelRemarks?orderDetailObject.tradeOrder.cancelRemarks:'无'}}</p>
-                        </nz-timeline-item>
+                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null">创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
+                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.payTime != null">支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.finishTime != null">完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.refundTime != null">退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
@@ -200,21 +194,23 @@
                 </nz-card>
             </nz-tab>
             <nz-tab nzTitle="产品信息">
-                <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true">
+                <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true" [nzScroll]="{ x: '1000px'}">
                     <thead>
                     <tr>
+                        <th nzWidth="110px">订单编号</th>
                         <th nzWidth="60px">产品类型</th>
                         <th nzWidth="150px">产品名称</th>
                         <th nzWidth="80px">产品规格</th>
-                        <th nzWidth="20px">数量</th>
-                        <th nzWidth="20px">单价</th>
-                        <th nzWidth="20px">总价</th>
+                        <th nzWidth="60px">数量</th>
+                        <th nzWidth="60px">单价</th>
+                        <th nzWidth="60px">总价</th>
                     </tr>
                     </thead>
                     <tbody>
                     <tr *ngFor="let data of childOrder.data">
+                        <td>{{ data.childOrderNo}}</td>
                         <td>{{ data.goodsType | orderChildGoodsType}}</td>
-                        <td>
+                        <td nzEllipsis>
                             {{ data.goodsName }}
                             <nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag>
                         </td>
diff --git a/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html b/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html
index 190e209..fb9dee1 100644
--- a/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html
+++ b/src/app/admin/order-manage/order-oil/order-oil-list/order-oil-list.component.html
@@ -324,14 +324,8 @@
             <nz-tab nzTitle="交易时间">
                 <nz-card>
                     <nz-timeline>
-                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null">
-                            <p>创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
-                            <p>备注：{{orderDetailObject.tradeOrder.remarks?orderDetailObject.tradeOrder.remarks:'无'}}</p>
-                        </nz-timeline-item>
-                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">
-                            <p>取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</p>
-                            <p>备注：{{orderDetailObject.tradeOrder.cancelRemarks?orderDetailObject.tradeOrder.cancelRemarks:'无'}}</p>
-                        </nz-timeline-item>
+                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.createTime != null">创建时间：{{orderDetailObject.tradeOrder.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
+                        <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.cancelTime != null">取消时间：{{orderDetailObject.tradeOrder.cancelTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.payTime != null">支付时间：{{orderDetailObject.tradeOrder.payTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.finishTime != null">完成时间：{{orderDetailObject.tradeOrder.finishTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
                         <nz-timeline-item *ngIf="orderDetailObject.tradeOrder.refundTime != null">退款时间：{{orderDetailObject.tradeOrder.refundTime | date : 'yyyy-MM-dd HH:mm:ss'}}</nz-timeline-item>
@@ -339,21 +333,23 @@
                 </nz-card>
             </nz-tab>
             <nz-tab nzTitle="产品信息">
-                <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true">
+                <nz-table #childOrder [nzData]="orderDetailObject.tradeOrder.highChildOrderList" [nzHideOnSinglePage]="true" [nzScroll]="{ x: '1000px'}">
                     <thead>
                     <tr>
+                        <th nzWidth="110px">订单编号</th>
                         <th nzWidth="60px">产品类型</th>
                         <th nzWidth="150px">产品名称</th>
                         <th nzWidth="80px">产品规格</th>
-                        <th nzWidth="20px">数量</th>
-                        <th nzWidth="20px">单价</th>
-                        <th nzWidth="20px">总价</th>
+                        <th nzWidth="60px">数量</th>
+                        <th nzWidth="60px">单价</th>
+                        <th nzWidth="60px">总价</th>
                     </tr>
                     </thead>
                     <tbody>
                     <tr *ngFor="let data of childOrder.data">
+                        <td>{{ data.childOrderNo}}</td>
                         <td>{{ data.goodsType | orderChildGoodsType}}</td>
-                        <td>
+                        <td nzEllipsis>
                             {{ data.goodsName }}
                             <nz-tag *ngIf="data.giveawayType == 1" [nzColor]="'magenta'">赠品</nz-tag>
                         </td>