1

src/app/admin/order/order-h-list/order-h-list.component.ts

@@ -46,6 +46,7 @@ export class OrderHListComponent implements OnInit {
 
   ngOnInit(): void {
     this.init();
+    console.log(typeof  this.store.get(ADMIN_INFO_OBJECT)['bsCompany'].id);
   }
 
 
@@ -75,6 +76,10 @@ export class OrderHListComponent implements OnInit {
     if (this.store.get(ADMIN_INFO_OBJECT)['highAgent'] != null) {
       whereObject['code'] = this.store.get(ADMIN_INFO_OBJECT)['highAgent'].id;
     }
+
+    if (this.store.get(ADMIN_INFO_OBJECT)['bsCompany'].id === 3) {
+      whereObject['code'] = 60;
+    }
     if (whereObject['payTime'] != null && whereObject['payTime'].length !== 0) {
       whereObject['payTimeS'] = whereObject['payTime'][0].getTime();
       whereObject['payTimeE'] = whereObject['payTime'][1].getTime();

src/app/admin/recharge-order/order-list/order-list.component.html

@@ -43,6 +43,7 @@
                             <nz-option nzLabel="微信" nzValue="1"></nz-option>
                             <nz-option nzLabel="工会卡" nzValue="2"></nz-option>
                             <nz-option nzLabel="积分" nzValue="3"></nz-option>
+                            <nz-option nzLabel="银联" nzValue="4"></nz-option>
                         </nz-select>
                     </nz-form-control>
                 </nz-form-item>

src/app/admin/system/system-organization/system-organization.component.ts

@@ -98,7 +98,7 @@ export class SystemOrganizationComponent implements OnInit {
     this.http.get(this.WEB_SERVE_URL + '/secUser/getUserList?companyId=' + this.USER_INFO['bsCompany'].id + '&pageNum=1&pageSize=10000').subscribe( data => {
       if (data['return_code'] === '000000') {
         this.UserList = data['return_data'].list;
-      } else {
+        } else {
         this.message.create('warning', data['return_msg']);
       }
     });

src/app/pipes/system.pipe.ts

@@ -21,6 +21,8 @@ export class SystemPipe implements PipeTransform {
         return '分公司账号';
       case 6:
         return '后台充值人员';
+      case 7:
+        return '渠道公司角色';
     }
   }