diff --git a/src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.html b/src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.html
index d3abb7f..9efd284 100644
--- a/src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.html
+++ b/src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.html
@@ -101,6 +101,7 @@
                     <a nz-dropdown [nzDropdownMenu]="menu"> 操作列表 <i nz-icon nzType="down"></i> </a>
                     <nz-dropdown-menu #menu="nzDropdownMenu">
                         <ul nz-menu nzSelectable>
+                            <li nz-menu-item (click)="showGasStaffQrCodeModal(data.id)"><a>二维码</a></li>
                             <li nz-menu-item [routerLink]="['/admin/gas-staff/edit']" [queryParams]="{ id: data.id}"><a>修改</a></li>
                             <li nz-menu-item (click)="showDisabledConfirm(data.id)" *ngIf="data.status == 1" ><a>禁用</a></li>
                             <li nz-menu-item (click)="showRecoverConfirm(data.id)" *ngIf="data.status == 2" ><a>恢复</a></li>
@@ -114,3 +115,9 @@
     </div>
 </nz-spin>
 
+<nz-modal [(nzVisible)]="gasStaffQrCodeModal" nzTitle="二维码" (nzOnCancel)="closeGasStaffQrCodeModal()" nzWidth="400px" [nzFooter]="null">
+    <img src="{{FILE_URL + 'gasStaff/' + gasStaffQrCodeImgUrl}}" style="width: 350px; height: 350px;">
+    <div style="width: 100%;margin-top: 15px;text-align: center;">
+        <span>鼠标右键点击“二维码”，另存为下载到本地</span>
+    </div>
+</nz-modal>
diff --git a/src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.ts b/src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.ts
index 8a259c7..d734e1f 100644
--- a/src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.ts
+++ b/src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.ts
@@ -32,6 +32,9 @@ export class GasStaffListComponent implements OnInit {
 
   positionTypeArray = [];
 
+  gasStaffQrCodeImgUrl: string;
+  gasStaffQrCodeModal = false;
+
   constructor(private modal: NzModalService,
               private message: NzMessageService,
               private store: LocalStorageService,
@@ -181,4 +184,29 @@ export class GasStaffListComponent implements OnInit {
     });
   }
 
+  /**
+   * 查询工作人员二维码
+   * @param id
+   */
+  showGasStaffQrCodeModal(id: number) {
+    this.gasStaffService.queryQrCode({ gasStaffId: id }, data => {
+      if (data['return_code'] === '000000') {
+        this.gasStaffQrCodeImgUrl = data['return_data'];
+        this.gasStaffQrCodeModal = true;
+      } else {
+        this.modal.error({
+          nzTitle: '提示',
+          nzContent: data['return_msg']
+        });
+      }
+    });
+  }
+
+  /**
+   * 关闭二维码模态框
+   */
+  closeGasStaffQrCodeModal() {
+    this.gasStaffQrCodeModal = false;
+  }
+
 }
diff --git a/src/app/admin/order/oil-station-order/oil-station-order.component.html b/src/app/admin/order/oil-station-order/oil-station-order.component.html
index 4fe402f..1af50d8 100644
--- a/src/app/admin/order/oil-station-order/oil-station-order.component.html
+++ b/src/app/admin/order/oil-station-order/oil-station-order.component.html
@@ -10,12 +10,22 @@
                 <nz-form-item>
                     <nz-form-label [nzSpan]="6">油站</nz-form-label>
                     <nz-form-control [nzSpan]="16">
-                        <nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择油站" formControlName="storeId">
+                        <nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择油站" formControlName="storeId" (ngModelChange)="selectGasChange($event)">
                             <nz-option *ngFor="let item of gasArray" nzLabel="{{item.storeName}}" nzValue="{{item.id}}"></nz-option>
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>
             </div>
+            <div nz-col nzSpan="8" *ngIf="userSession['secUser']['objectType'] == 1 || userSession['secUser']['objectType'] == 2 || userSession['secUser']['objectType'] == 3 || (userSession['secUser']['objectType'] == 8 && userSession['gasStaff'] != null && userSession['gasStaff']['positionType'] != 2)">
+                <nz-form-item>
+                    <nz-form-label [nzSpan]="6">加油员</nz-form-label>
+                    <nz-form-control [nzSpan]="16">
+                        <nz-select nzShowSearch nzAllowClear nzPlaceHolder="请选择加油员" formControlName="staffId">
+                            <nz-option *ngFor="let item of gasStaffArray" nzLabel="{{item.name}}" nzValue="{{item.id}}"></nz-option>
+                        </nz-select>
+                    </nz-form-control>
+                </nz-form-item>
+            </div>
             <div nz-col nzSpan="8">
                 <nz-form-item>
                     <nz-form-label [nzSpan]="6">订单号</nz-form-label>
@@ -89,6 +99,7 @@
             <th nzWidth="60px">编号</th>
             <th nzWidth="200px">订单号</th>
             <th nzWidth="180px">油站名称</th>
+            <th nzWidth="100px">加油员</th>
             <th nzWidth="90px">类型</th>
             <th nzWidth="90px">油号</th>
             <th nzWidth="90px">油枪号</th>
@@ -108,6 +119,7 @@
             <td>{{i + 1}}</td>
             <td>{{data.orderNo}}</td>
             <td>{{data.gasName}}</td>
+            <td>{{data.gasStaffName?data.gasStaffName:'未知'}}</td>
             <td>{{data.gasOilType == 1 ? '汽油': '柴油'}}</td>
             <td>{{data.gasOilNo + "#"}}</td>
             <td>{{data.gasGunNo + "号"}}</td>
diff --git a/src/app/admin/order/oil-station-order/oil-station-order.component.ts b/src/app/admin/order/oil-station-order/oil-station-order.component.ts
index 38b45a7..3f2f509 100644
--- a/src/app/admin/order/oil-station-order/oil-station-order.component.ts
+++ b/src/app/admin/order/oil-station-order/oil-station-order.component.ts
@@ -12,6 +12,7 @@ import {CommonsService} from '../../../services/commons.service';
 import {WebsocketService} from '../../../services/websocket.service';
 import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
 import {MerchantStoreService} from '../../../services/merchant-store.service';
+import {GasStaffService} from "../../../services/gas-staff.service";
 
 @Component({
   selector: 'app-oil-station-order',
@@ -46,6 +47,9 @@ export class OilStationOrderComponent implements OnInit {
     };
     printModal = false;
 
+    userSession = {};
+    gasStaffArray = [];
+
     constructor(
         private form: FormBuilder,
         private order: OrderService,
@@ -57,6 +61,7 @@ export class OilStationOrderComponent implements OnInit {
         private company: CompanyService,
         private merchant: MerchantService,
         private merchantStoreService: MerchantStoreService,
+        private gasStaffService: GasStaffService,
         private orderService: OrderService,
         private store: LocalStorageService, // 数据请求
         private common: CommonsService
@@ -64,6 +69,7 @@ export class OilStationOrderComponent implements OnInit {
     }
 
     ngOnInit(): void {
+        this.userSession = this.store.get(ADMIN_INFO_OBJECT);
         this.secUser = this.store.get(ADMIN_INFO_OBJECT)['secUser'];
         if (this.secUser['objectType'] === 2) {
             this.merchantStoreService.getStoreListByMerchant({ pageNum: 1, pageSize: 100}, data => {
@@ -71,6 +77,10 @@ export class OilStationOrderComponent implements OnInit {
                    this.gasArray = data['return_data']['list'];
                }
             });
+        } else if (this.secUser['objectType'] === 3) {
+            this.getStaffList(null);
+        } else if (this.secUser['objectType'] === 8) {
+            this.getStaffList(null);
         }
         this.init();
         // 接收消息
@@ -86,6 +96,7 @@ export class OilStationOrderComponent implements OnInit {
     public init(): void {
         this.searchForm = this.form.group({
             storeId: [null],
+            staffId: [null],
             orderNo: [null],
             status: [null],
             createTime: [null],
@@ -116,6 +127,27 @@ export class OilStationOrderComponent implements OnInit {
         });
     }
 
+    // 查询列表
+    public getStaffList(gasId: number) {
+        const param = { pageNum: 1 , pageSize: 9999};
+        if (gasId != null) {
+            param['merchantStoreId'] = gasId;
+        }
+        this.gasStaffService.getStaffList(param, data => {
+            if (data['return_code'] === '000000') {
+                this.gasStaffArray = data['return_data']['list'];
+            }
+        });
+    }
+
+    selectGasChange(gasId: number) {
+        if (gasId != null) {
+            this.getStaffList(gasId);
+        } else {
+            this.gasStaffArray = [];
+        }
+    }
+
     // 重置
     public resetForm(): void {
         this.searchForm.reset();
diff --git a/src/app/services/gas-staff.service.ts b/src/app/services/gas-staff.service.ts
index 6b38116..8cb1cf2 100644
--- a/src/app/services/gas-staff.service.ts
+++ b/src/app/services/gas-staff.service.ts
@@ -96,4 +96,16 @@ export class GasStaffService {
       callBack(data);
     });
   }
+
+  /**
+   * 查询二维码
+   *
+   * @param  param   参数对象
+   * @param  callBack   回调
+   */
+  public queryQrCode(param: object, callBack) {
+    this.http.post(environment.baseUrl + 'gasStaff/queryQrCode', param).subscribe(data => {
+      callBack(data);
+    });
+  }
 }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index cc5edd5..ca22a39 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,10 +4,10 @@
 
 export const environment = {
   production: false,
-  baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'http://localhost:9302/filesystem/',
-  // baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  // imageUrl: 'https://hsg.dctpay.com/filesystem/',
+/*  baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+  imageUrl: 'http://localhost:9302/filesystem/',*/
+  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
   inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
 };