合并代码

pull/1/head
袁野 3 years ago
commit fc78d3b1c0
  1. 3252
      package-lock.json
  2. 1
      package.json
  3. 5
      src/app/admin/activate/activate-edit/activate-edit.component.ts
  4. 2
      src/app/admin/activate/activate-list/activate-list.component.ts
  5. 4
      src/app/admin/activate/activate-lottery-record/activate-lottery-record.component.ts
  6. 4
      src/app/admin/activate/activate.module.ts
  7. 26
      src/app/admin/agent/agent-list/agent-list.component.html
  8. 14
      src/app/admin/agent/agent-list/agent-list.component.ts
  9. 2
      src/app/admin/agent/agent.module.ts
  10. 4
      src/app/admin/api-merchants/api-merchants.module.ts
  11. 6
      src/app/admin/api-merchants/list/list.component.ts
  12. 4
      src/app/admin/api-product/api-product.module.ts
  13. 6
      src/app/admin/api-product/list/list.component.ts
  14. 4
      src/app/admin/company-amount/company-amount-record/company-amount-record.component.ts
  15. 6
      src/app/admin/company-amount/company-amount.module.ts
  16. 6
      src/app/admin/company-amount/pay-pwd/pay-pwd.component.ts
  17. 6
      src/app/admin/config-manage/brand/brand.component.ts
  18. 4
      src/app/admin/config-manage/config-manage.module.ts
  19. 6
      src/app/admin/config-manage/goods-type/goods-type.component.ts
  20. 6
      src/app/admin/device/device-list/device-list.component.ts
  21. 6
      src/app/admin/device/device.module.ts
  22. 4
      src/app/admin/discount-package/discount-package-edit/discount-package-edit.component.ts
  23. 6
      src/app/admin/discount-package/discount-package-list/discount-package-list.component.ts
  24. 4
      src/app/admin/discount-package/discount-package.module.ts
  25. 6
      src/app/admin/discount-package/inventory-record/inventory-record.component.ts
  26. 6
      src/app/admin/discount-package/order-list/order-list.component.ts
  27. 14
      src/app/admin/discount/discount-edit/discount-edit.component.html
  28. 1
      src/app/admin/discount/discount-edit/discount-edit.component.ts
  29. 20
      src/app/admin/discount/discount-list/discount-list.component.html
  30. 114
      src/app/admin/gas-class-group/gas-class-group-list/gas-class-group-list.component.html
  31. 0
      src/app/admin/gas-class-group/gas-class-group-list/gas-class-group-list.component.scss
  32. 159
      src/app/admin/gas-class-group/gas-class-group-list/gas-class-group-list.component.ts
  33. 16
      src/app/admin/gas-class-group/gas-class-group-routing.module.ts
  34. 188
      src/app/admin/gas-class-group/gas-class-group-task/gas-class-group-task.component.html
  35. 8
      src/app/admin/gas-class-group/gas-class-group-task/gas-class-group-task.component.scss
  36. 388
      src/app/admin/gas-class-group/gas-class-group-task/gas-class-group-task.component.ts
  37. 25
      src/app/admin/gas-class-group/gas-class-group.module.ts
  38. 7
      src/app/admin/gas-oil-price/gas-oil-price.module.ts
  39. 6
      src/app/admin/gas-oil-price/oil-price-official-list/oil-price-official-list.component.ts
  40. 6
      src/app/admin/gas-oil-price/oil-price-task-edit/oil-price-task-edit.component.ts
  41. 6
      src/app/admin/gas-oil-price/oil-price-task-list/oil-price-task-list.component.ts
  42. 6
      src/app/admin/gas-staff/gas-staff-edit/gas-staff-edit.component.ts
  43. 7
      src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.html
  44. 34
      src/app/admin/gas-staff/gas-staff-list/gas-staff-list.component.ts
  45. 6
      src/app/admin/gas-staff/gas-staff.module.ts
  46. 4
      src/app/admin/gz-sinopec/gz-sinopec.module.ts
  47. 4
      src/app/admin/gz-sinopec/offline-assign/offline-assign.component.ts
  48. 4
      src/app/admin/gz-sinopec/use-order/use-order.component.ts
  49. 4
      src/app/admin/index/index/index.component.ts
  50. 2
      src/app/admin/index/test/test.component.ts
  51. 1
      src/app/admin/login/login/login.component.ts
  52. 138
      src/app/admin/merchant-store/gas-station-list/gas-station-list.component.html
  53. 3
      src/app/admin/merchant-store/gas-station-list/gas-station-list.component.scss
  54. 25
      src/app/admin/merchant-store/gas-station-list/gas-station-list.component.spec.ts
  55. 134
      src/app/admin/merchant-store/gas-station-list/gas-station-list.component.ts
  56. 2
      src/app/admin/merchant-store/merchant-store-routing.module.ts
  57. 3
      src/app/admin/merchant-store/merchant-store.module.ts
  58. 6
      src/app/admin/merchant-store/oli/oli.component.ts
  59. 4
      src/app/admin/merchant-store/store-edit/store-edit.component.html
  60. 6
      src/app/admin/oil-card/oil-card-list/oil-card-list.component.ts
  61. 8
      src/app/admin/oil-card/oil-card-op-record-list/oil-card-op-record-list.component.ts
  62. 6
      src/app/admin/oil-card/oil-card-order/oil-card-order.component.ts
  63. 6
      src/app/admin/oil-card/oil-card-record-list/oil-card-record-list.component.ts
  64. 6
      src/app/admin/oil-card/oil-card.module.ts
  65. 4
      src/app/admin/order/discount-use-condition-list/discount-use-condition-list.component.ts
  66. 14
      src/app/admin/order/oil-station-order/oil-station-order.component.html
  67. 82
      src/app/admin/order/oil-station-order/oil-station-order.component.ts
  68. 6
      src/app/admin/order/order-agent/order-agent.component.ts
  69. 2
      src/app/admin/order/order.module.ts
  70. 6
      src/app/admin/order/package-record-list/package-record-list.component.ts
  71. 19
      src/app/admin/system/system-user/system-user.component.html
  72. 24
      src/app/admin/system/system-user/system-user.component.ts
  73. 4
      src/app/admin/tuanyou-agent/order-st/order-st.component.ts
  74. 4
      src/app/admin/tuanyou-agent/order/ty-order-list/ty-order-list.component.ts
  75. 4
      src/app/admin/tuanyou-agent/petrol-station-manage/petrol-station-manage.ts
  76. 2
      src/app/admin/tuanyou-agent/tuanyou-agent.module.ts
  77. 4
      src/app/admin/tuanyou-agent/ty-agent/ty-agent-list/ty-agent-list.component.ts
  78. 6
      src/app/admin/tuanyou-agent/ty-salesman/ty-salesman-edit/ty-salesman-edit.component.ts
  79. 6
      src/app/admin/tuanyou-agent/ty-salesman/ty-salesman-list/ty-salesman-list.component.ts
  80. 3
      src/app/app-common.module.ts
  81. 5
      src/app/app-routing.module.ts
  82. 17
      src/app/pipes/gas-class-group-task/gas-class-group-task-status.pipe.ts
  83. 1
      src/app/pipes/index.ts
  84. 2
      src/app/services/activate.service.ts
  85. 6
      src/app/services/agent.service.ts
  86. 2
      src/app/services/api-merchants.service.ts
  87. 2
      src/app/services/api-product.service.ts
  88. 2
      src/app/services/company-account.service.ts
  89. 2
      src/app/services/company-two-pwd.service.ts
  90. 2
      src/app/services/config.service.ts
  91. 2
      src/app/services/device.service.ts
  92. 100
      src/app/services/gas-class-group-task.service.ts
  93. 63
      src/app/services/gas-class-group.service.ts
  94. 14
      src/app/services/gas-staff.service.ts
  95. 2
      src/app/services/gas.service.ts
  96. 26
      src/app/services/index.service.ts
  97. 2
      src/app/services/mer-amount.service.ts
  98. 3
      src/app/services/merchant-tripartite-platform.service.ts
  99. 2
      src/app/services/oil-card.service.ts
  100. 2
      src/app/services/oil-price/oil-price-official.service.ts
  101. Some files were not shown because too many files have changed in this diff Show More

3252
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -24,6 +24,7 @@
"echarts": "^4.9.0",
"jquery": "^3.5.1",
"ng-zorro-antd": "^9.3.0",
"ngx-clipboard": "^12.3.0",
"ngx-echarts": "^4.2.2",
"rxjs": "~6.5.4",
"tslib": "^1.10.0",

@ -1,12 +1,11 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router';
import {CouponService} from '../../../services/coupon.service';
import {ActivateService} from '../../../services/activate.service';
import {NzUploadFile} from 'ng-zorro-antd';
import {NzMessageService, NzUploadFile} from 'ng-zorro-antd';
import {environment} from '../../../../environments/environment';
import {AgentService} from '../../../services/agent.service';
import {ActivatedRoute} from '@angular/router';
function getBase64(file: File): Promise<string | ArrayBuffer | null> {
return new Promise((resolve, reject) => {

@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {CompanyService} from '../../../services/company.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {NzMessageService} from 'ng-zorro-antd';
import {CommonsService} from '../../../services/commons.service';
import {FormBuilder, FormGroup} from '@angular/forms';
import {Router} from '@angular/router';

@ -1,9 +1,9 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from "_@angular_forms@9.0.7@@angular/forms";
import {ActivateService} from "../../../services/activate.service";
import {IconService} from "../../../services/icon.service";
import {NzMessageService} from "_ng-zorro-antd@9.3.0@ng-zorro-antd";
import { Params, ActivatedRoute } from '@angular/router';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService} from 'ng-zorro-antd';
@Component({
selector: 'app-activate-lottery-record',

@ -4,9 +4,9 @@ import { CommonModule } from '@angular/common';
import { ActivateRoutingModule } from './activate-routing.module';
import { ActivateListComponent } from './activate-list/activate-list.component';
import { ActivateEditComponent } from './activate-edit/activate-edit.component';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {SeparateModule} from '../../common/separate/separate.module';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
import {AppCommonModule} from "../../app-common.module";

@ -141,8 +141,8 @@
</form>
</nz-modal>
<nz-modal [(nzVisible)]="isVisibleDiscount" nzWidth="1000" nzTitle="分配优惠券列表" (nzOnCancel)="handleCancelDiscount()"
(nzOnOk)="handleCancelDiscount()">
<nz-modal [(nzVisible)]="isVisibleDiscount" nzWidth="1000" nzTitle="代理商优惠券列表" (nzOnCancel)="handleCancelDiscount()"
(nzOnOk)="handleCancelDiscount()" [nzFooter]="null">
<nz-table
class="table"
#ajaxTableDiscount
@ -165,6 +165,7 @@
<th nzWidth="70px">有效天数</th>
<th nzWidth="100px">截止日期</th>
<th nzWidth="100px">库存数量</th>
<th nzWidth="100px">操作</th>
</tr>
</thead>
<tbody>
@ -186,6 +187,15 @@
<td>{{data['highDiscount'].effectiveDay}}</td>
<td>{{data['highDiscount'].salesEndTime | date: 'yyyy-MM-dd HH:mm'}}</td>
<td>{{data.stockCount}}</td>
<td>
<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)="copyReceiveDiscountLink(data.id)">复制领取链接</li>
<!-- <li nz-menu-item>赠送用户优惠券</li>-->
</ul>
</nz-dropdown-menu>
</td>
</tbody>
</nz-table>
</nz-modal>
@ -198,7 +208,7 @@
<nz-form-label [nzSpan]="6" nzRequired>卡券</nz-form-label>
<nz-form-control [nzSpan]="16" nzErrorTip="请选择卡券!">
<nz-select nzShowSearch nzAllowClear formControlName="couponId" nzPlaceHolder="请选择卡券">
<nz-option *ngFor="let item of distributeList" nzLabel="{{item.couponName + '-(有效库存:' + item.stockCount + ')'}}"
<nz-option *ngFor="let item of distributeList" nzLabel="{{item['displayArea'] | displayArea}}】{{ item.couponName + '-(有效库存:' + item.stockCount + ')'}}"
nzValue="{{item.id}}"></nz-option>
</nz-select>
</nz-form-control>
@ -238,16 +248,18 @@
(nzPageSizeChange)="getRequestList(false)">
<thead nzSingleSort>
<tr>
<th nzWidth="80px">卡券名称</th>
<th nzWidth="80px">卡券销售价格</th>
<th nzWidth="80px">库存数量</th>
<th nzWidth="70px">销售数量</th>
<th nzWidth="50px">展示专区</th>
<th nzWidth="100px">卡券名称</th>
<th nzWidth="50px">卡券价格</th>
<th nzWidth="50px">库存数量</th>
<th nzWidth="50px">销售数量</th>
<th nzWidth="70px">分发时间</th>
<th nzWidth="70px">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of ajaxTableList.data; let i = index">
<td>{{data['highCoupon']['displayArea'] | displayArea}}</td>
<td>{{data['couponName']}}</td>
<td>{{data['salesPrice']}}元</td>
<td>{{data['stockCount']}}</td>

@ -8,6 +8,7 @@ import {CommonsService} from '../../../services/commons.service';
import {AgentService} from '../../../services/agent.service';
import {DiscountService} from '../../../services/discount.service';
import {CouponService} from '../../../services/coupon.service';
import {ClipboardService} from "ngx-clipboard";
@Component({
selector: 'app-agent-list',
@ -57,6 +58,7 @@ export class AgentListComponent implements OnInit {
private iconService: IconService,
private message: NzMessageService,
private router: Router,
private clipboardService: ClipboardService,
private common: CommonsService
) {
}
@ -317,5 +319,17 @@ export class AgentListComponent implements OnInit {
}
});
}
copyReceiveDiscountLink(id: number) {
this.agent.getReceiveLink(id, data => {
if (data['return_code']) {
this.clipboardService.copy(data['return_data']);
this.message.success('复制成功');
} else {
this.message.error('复制失败');
}
});
}
}

@ -10,6 +10,7 @@ import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
import {AppCommonModule} from '../../app-common.module';
import {ClipboardModule} from 'ngx-clipboard';
@NgModule({
@ -23,6 +24,7 @@ import {AppCommonModule} from '../../app-common.module';
FormsModule,
BreadcrumbModule,
RegionSelectorModule,
ClipboardModule,
AppCommonModule
]
})

@ -3,12 +3,12 @@ import {CommonModule} from '@angular/common';
import {ApiMerchantsRoutingModule} from './api-merchants-routing.module';
import {ListComponent} from './list/list.component';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {SeparateModule} from '../../common/separate/separate.module';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
import {AppCommonModule} from '../../app-common.module';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
@NgModule({

@ -1,13 +1,13 @@
import {Component, OnInit} from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {CouponService} from '../../../services/coupon.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {CommonsService} from '../../../services/commons.service';
import {ApiMerchantsService} from '../../../services/api-merchants.service';
import {ApiProductService} from '../../../services/api-product.service';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
@Component({

@ -3,12 +3,12 @@ import {CommonModule} from '@angular/common';
import {ApiProductRoutingModule} from './api-product-routing.module';
import {ListComponent} from './list/list.component';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {SeparateModule} from '../../common/separate/separate.module';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
import {AppCommonModule} from '../../app-common.module';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
@NgModule({

@ -1,14 +1,14 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {RechargeService} from '../../../services/recharge.service';
import {DiscountService} from '../../../services/discount.service';
import {CouponService} from '../../../services/coupon.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {CommonsService} from '../../../services/commons.service';
import {ApiProductService} from '../../../services/api-product.service';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
@Component({
selector: 'app-list',

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {OrganizationService} from '../../../services/organization.service';
import {LocalStorageService} from '../../../services/local-storage.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';

@ -3,11 +3,11 @@ import { CommonModule } from '@angular/common';
import { CompanyAmountRoutingModule } from './company-amount-routing.module';
import { CompanyAmountRecordComponent } from './company-amount-record/company-amount-record.component';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {AppCommonModule} from '../../app-common.module';
import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
import {NgxEchartsModule} from 'ngx-echarts';
import { PayPwdComponent } from './pay-pwd/pay-pwd.component';

@ -1,12 +1,12 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormControl, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
import {ValidatorsService} from '../../../services/validators.service';
import {LocalStorageService} from '../../../services/local-storage.service';
import {LoginService} from '../../../services/login.service';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {CommonsService} from '../../../services/commons.service';
import {CompanyTwoPwdService} from '../../../services/company-two-pwd.service';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {IconService} from '../../../services/icon.service';
@Component({

@ -1,9 +1,9 @@
import {Component, OnInit} from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {IconService} from '../../../services/icon.service';
import {NzMessageService, NzModalService, NzUploadFile} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService, NzModalService, NzUploadFile} from 'ng-zorro-antd';
import {Router} from '@angular/router';
import {ConfigService} from '../../../services/config.service';
function getBase64(file: File): Promise<string | ArrayBuffer | null> {

@ -4,11 +4,11 @@ import { CommonModule } from '@angular/common';
import { ConfigManageRoutingModule } from './config-manage-routing.module';
import { GoodsTypeComponent } from './goods-type/goods-type.component';
import { BrandComponent } from './brand/brand.component';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {SeparateModule} from '../../common/separate/separate.module';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import { ThirdProductComponent } from './third-product/third-product.component';
import {AppCommonModule} from "../../app-common.module";
import { MemberProductComponent } from './member-product/member-product.component';

@ -1,10 +1,10 @@
import {Component, OnInit} from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {IconService} from '../../../services/icon.service';
import {NzMessageService, NzModalService, NzUploadFile} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService, NzModalService, NzUploadFile} from 'ng-zorro-antd';
import {ConfigService} from '../../../services/config.service';
import {Router} from '@angular/router';
function getBase64(file: File): Promise<string | ArrayBuffer | null> {
return new Promise((resolve, reject) => {

@ -1,15 +1,15 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {LocalStorageService} from '../../../services/local-storage.service';
import {OilCardService} from '../../../services/oil-card.service';
import {OrganizationService} from '../../../services/organization.service';
import {CompanyAccountService} from '../../../services/company-account.service';
import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {ValidatorsService} from '../../../services/validators.service';
import {DeviceService} from "../../../services/device.service";
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute} from '@angular/router';
@Component({
selector: 'app-device-list',

@ -3,11 +3,11 @@ import { CommonModule } from '@angular/common';
import { DeviceRoutingModule } from './device-routing.module';
import { DeviceListComponent } from './device-list/device-list.component';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {AppCommonModule} from '../../app-common.module';
import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {NgxEchartsModule} from 'ngx-echarts';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
@NgModule({

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService} from 'ng-zorro-antd';
import {ActivatedRoute} from '@angular/router';
import {CouponService} from '../../../services/coupon.service';
import {ActivateService} from '../../../services/activate.service';
import {NzUploadFile} from 'ng-zorro-antd';

@ -1,11 +1,11 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup} from '@angular/forms';
import {CompanyService} from '../../../services/company.service';
import {ActivateService} from '../../../services/activate.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
import {CommonsService} from '../../../services/commons.service';
import {DiscountPackageService} from '../../../services/discount-package.service';

@ -3,9 +3,9 @@ import { CommonModule } from '@angular/common';
import { DiscountPackageRoutingModule } from './discount-package-routing.module';
import { DiscountPackageListComponent } from './discount-package-list/discount-package-list.component';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {SeparateModule} from '../../common/separate/separate.module';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {RegionSelectorModule} from '../../common/region-selector/region-selector.module';
import {AppCommonModule} from '../../app-common.module';

@ -1,11 +1,11 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup} from '@angular/forms';
import {CompanyService} from '../../../services/company.service';
import {ActivateService} from '../../../services/activate.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
import {CommonsService} from '../../../services/commons.service';
import {DiscountPackageService} from '../../../services/discount-package.service';

@ -1,11 +1,11 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup} from '@angular/forms';
import {CompanyService} from '../../../services/company.service';
import {ActivateService} from '../../../services/activate.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
import {CommonsService} from '../../../services/commons.service';
import {DiscountPackageService} from '../../../services/discount-package.service';

@ -72,8 +72,8 @@
<div nz-col [nzSpan]="8">
<nz-form-item>
<nz-form-label [nzFor]="'salesEndTime'" nzRequired>截止日期</nz-form-label>
<nz-form-control nzErrorTip="请选择销售截止日期!">
<nz-form-label [nzFor]="'salesEndTime'" nzRequired>使用截止日期</nz-form-label>
<nz-form-control>
<nz-date-picker
nzFormat="yyyy-MM-dd"
[formControlName]="'salesEndTime'"
@ -90,6 +90,16 @@
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="8">
<nz-form-item>
<nz-form-label [nzFor]="'effectiveDay'" nzRequired>可领取次数</nz-form-label>
<nz-form-control nzErrorTip="请输入可领取次数!">
<nz-input-number [formControlName]="'receiveNumber'" [nzMin]="0" [nzStep]="1" [nzMax]="999"></nz-input-number>
</nz-form-control>
</nz-form-item>
</div>
<div nz-col [nzSpan]="8">
<nz-form-item>
<nz-form-label nzRequired>优惠券图片</nz-form-label>

@ -61,6 +61,7 @@ export class DiscountEditComponent implements OnInit {
salesEndTime: [null, [Validators.required]],
useScope: [null, [Validators.required]],
effectiveDay: [1, [Validators.required]],
receiveNumber: [1, [Validators.required]],
status: [null],
usingRange: [null],
createTime: [null],

@ -73,16 +73,17 @@
(nzPageSizeChange)="getRequest(false , searchForm.value)">
<thead nzSingleSort>
<tr>
<th nzWidth="50px">编号</th>
<th nzWidth="80px">优惠券KEY</th>
<th nzWidth="80px">优惠券名称</th>
<th nzWidth="80px">优惠券类型</th>
<th nzWidth="70px">优惠内容</th>
<th nzWidth="70px">有效天数</th>
<th nzWidth="60px">编号</th>
<th nzWidth="150px">优惠券KEY</th>
<th nzWidth="130px">优惠券名称</th>
<th nzWidth="100px">优惠券类型</th>
<th nzWidth="100px">优惠内容</th>
<th nzWidth="100px">有效天数</th>
<th nzWidth="100px">可领取次数</th>
<th nzWidth="100px">截止日期</th>
<th nzWidth="100px">创建时间</th>
<th nzWidth="100px">状态</th>
<th nzWidth="80px" nzRight="0px">操作</th>
<th nzWidth="110px" nzRight="0px">操作</th>
</tr>
</thead>
<tbody>
@ -103,8 +104,9 @@
</span>
</td>
<td>{{data.effectiveDay}}</td>
<td>{{data.salesEndTime | date: 'yyyy-MM-dd HH:mm'}}</td>
<td>{{data.createTime}}</td>
<td>{{data.receiveNumber}}</td>
<td>{{data.salesEndTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{data.status | discountStatus}}</td>
<td nzRight="0px" class="table-td-operation">
<!-- <a (click)="getEdit(data.id)"><i nz-icon nzType="form" nzTheme="outline" nz-tooltip="编辑"></i></a>-->

@ -0,0 +1,114 @@
<!-- start 面包屑 -->
<app-breadcrumb></app-breadcrumb>
<!-- end 面包屑 -->
<!--条件搜索-->
<div class="inner-content">
<form nz-form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)">
<div nz-row>
<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="name" />
</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="principalName" />
</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="principalPhone" />
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row>
<div nz-col nzSpan="24" class="search-button">
<button nz-button nzType="primary"><i nz-icon nzType="search" nzTheme="outline"></i>搜索</button>
<button nz-button nzType="default" (click)="resetForm()"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button>
</div>
</div>
</form>
</div>
<div class="inner-content">
<span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span>
<div class="operating-button">
<button nz-button nzType="primary" class="right-btn" (click)="showEditClassGroup(null)"><i nz-icon nzType="plus" nzTheme="outline"></i>添加班组</button>
</div>
<!--数组表格 -->
<nz-table #basicTable
[nzData]="dataObject.list"
[nzTotal]="dataObject.total"
[nzFrontPagination]="false"
[nzLoading]="tableLoading"
[nzPageIndex]="whereObject.pageNum"
(nzPageIndexChange)="requestData($event)"
[nzScroll]="{ x: '1150px'}">
<thead>
<tr>
<th nzWidth="80px">序号</th>
<th nzWidth="100px">班组名称</th>
<th nzWidth="100px">负责人名称</th>
<th nzWidth="100px">负责人电话</th>
<th nzWidth="120px">创建时间</th>
<th nzWidth="100px" nzRight="0px">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data;let i = index">
<td>{{i + 1}}</td>
<td>{{data.name}}</td>
<td>{{data.principalName}}</td>
<td>{{data.principalPhone}}</td>
<td>{{data.createTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td nzRight="0px" class="table-td-operation">
<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><a (click)="showEditClassGroup(data)" >修改</a></li>
<li nz-menu-item><a (click)="showDeleteConfirm(data.id)">删除</a></li>
</ul>
</nz-dropdown-menu>
</td>
</tr>
</tbody>
</nz-table>
</div>
<nz-modal [(nzVisible)]="classGroupModal" nzTitle="编辑班组" (nzOnCancel)="closeEditClassGroup()" nzWidth="500px" [nzFooter]="null">
<form nz-form [formGroup]="classGroupForm">
<nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired >班组名称</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="name" />
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired >负责人名称</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="principalName" />
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired >负责人电话</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="principalPhone" />
</nz-form-control>
</nz-form-item>
<div style="text-align: center;">
<button nz-button nzType="primary" style="width: 150px;" (click)="submitEditClassGroup()">保存</button>
</div>
</form>
</nz-modal>

@ -0,0 +1,159 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {GasClassGroupService} from '../../../services/gas-class-group.service';
@Component({
selector: 'app-gas-class-group-list',
templateUrl: './gas-class-group-list.component.html',
styleUrls: ['./gas-class-group-list.component.scss']
})
export class GasClassGroupListComponent implements OnInit {
dataObject: any = {};
tableLoading = true;
searchForm: FormGroup;
pageNum: number;
whereObject: any = {};
classGroupModal = false;
classGroupForm: FormGroup;
constructor(private modal: NzModalService,
private message: NzMessageService,
private gasClassGroupService: GasClassGroupService,
private form: FormBuilder) { }
ngOnInit(): void {
this.searchForm = this.form.group({
name: [null],
principalName: [null],
principalPhone: [null],
});
this.classGroupForm = this.form.group({
id: [null],
name: [null, [Validators.required]],
principalName: [null, [Validators.required]],
principalPhone: [null, [Validators.required]],
});
this.requestData(1);
}
/**
*
*/
requestData(pageNum) {
this.tableLoading = true;
this.whereObject['pageNum'] = pageNum;
this.whereObject['pageSize'] = 10;
this.gasClassGroupService.getClassGroupList(this.whereObject, data => {
if (data['return_code'] === '000000') {
this.dataObject = data['return_data'];
} else {
this.modal.error(data['return_msg']);
}
this.tableLoading = false;
});
}
/**
*
* @param whereObject
*/
search(whereObject: object) {
this.whereObject = whereObject;
this.requestData(1);
}
/**
*
*/
resetForm(): void {
this.searchForm.reset();
}
/**
*
*/
showDeleteConfirm(groupId: number): void {
this.modal.confirm({
nzTitle: '警告',
nzContent: '是否删除班组',
nzOkText: '是',
nzCancelText: '否',
nzOkType: 'danger',
nzOnOk: () => this.deleteData(groupId)
});
}
/**
*
*
*/
deleteData(groupId: number) {
this.gasClassGroupService.delClassGroup(groupId, data => {
if (data['return_code'] === '000000') {
this.requestData(this.whereObject['pageNum']);
} else {
this.modal.error({
nzTitle: '提示',
nzContent: data['return_msg']
});
}
});
}
/**
*
*/
showEditClassGroup(data: object) {
if (data != null) {
this.classGroupForm.patchValue(data);
}
this.classGroupModal = true;
}
/**
*
*/
closeEditClassGroup() {
this.classGroupForm.reset();
this.classGroupModal = false;
}
/**
*
*/
submitEditClassGroup(){
for (const i in this.classGroupForm.controls) {
this.classGroupForm.controls[i].markAsDirty();
this.classGroupForm.controls[i].updateValueAndValidity();
}
if (this.classGroupForm.status == null || this.classGroupForm.status !== 'VALID') {
this.modal.warning({
nzTitle: '提示',
nzContent: '请填写所有必填项',
});
return;
}
// 提交数据
this.gasClassGroupService.editClassGroup(this.classGroupForm.value, data => {
if (data['return_code'] === '000000') {
this.modal.success({
nzTitle: '提示',
nzContent: '保存成功',
});
this.closeEditClassGroup();
this.requestData(this.whereObject['pageNum']);
} else {
this.modal.warning({
nzTitle: '提示',
nzContent: data['return_msg'],
});
}
});
}
}

@ -0,0 +1,16 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import {GasClassGroupListComponent} from './gas-class-group-list/gas-class-group-list.component';
import {GasClassGroupTaskComponent} from './gas-class-group-task/gas-class-group-task.component';
const routes: Routes = [
{ path: 'list', component: GasClassGroupListComponent},
{ path: 'task-list', component: GasClassGroupTaskComponent},
];
@NgModule({
imports: [RouterModule.forChild(routes)],
exports: [RouterModule]
})
export class GasClassGroupRoutingModule { }

@ -0,0 +1,188 @@
<!-- start 面包屑 -->
<app-breadcrumb></app-breadcrumb>
<!-- end 面包屑 -->
<!--条件搜索-->
<!--<div class="inner-content">
<form nz-form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)">
<div nz-row>
<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="name" />
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row>
<div nz-col nzSpan="24" class="search-button">
<button nz-button nzType="primary"><i nz-icon nzType="search" nzTheme="outline"></i>搜索</button>
<button nz-button nzType="default" (click)="resetForm()"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button>
</div>
</div>
</form>
</div>-->
<div class="inner-content">
<nz-row [nzGutter]="16">
<nz-col [nzSpan]="4">
<nz-statistic [nzValue]="currentClassGroupCountData['classNum'] == null ? '' : currentClassGroupCountData['classNum'] + ' '" [nzTitle]="'当前班次'"></nz-statistic>
</nz-col>
<nz-col [nzSpan]="4">
<nz-statistic [nzValue]="currentClassGroupCountData['refuelPrice']" [nzTitle]="'加油总金额'" [nzSuffix]="''"></nz-statistic>
</nz-col>
<nz-col [nzSpan]="4">
<nz-statistic [nzValue]="currentClassGroupCountData['refuelNum']" [nzTitle]="'加油总笔数'" [nzSuffix]="''"></nz-statistic>
</nz-col>
<nz-col [nzSpan]="4">
<nz-statistic [nzValue]="currentClassGroupCountData['refuelLiters']" [nzTitle]="'加油总升数'" [nzSuffix]="''"></nz-statistic>
</nz-col>
<nz-col [nzSpan]="4">
<nz-statistic [nzValue]="currentClassGroupCountData['refundPrice']" [nzTitle]="'退款总金额'" [nzSuffix]="''"></nz-statistic>
</nz-col>
<nz-col [nzSpan]="4">
<nz-statistic [nzValue]="currentClassGroupCountData['refundNum']" [nzTitle]="'退款总笔数'" [nzSuffix]="''"></nz-statistic>
</nz-col>
</nz-row>
<div class="gas-count-btn">
<button nz-button nzType="primary" *ngIf="currentClassGroupCountData.status == 0" (click)="showStartClassGroupModal()"><i nz-icon nzType="sync" nzTheme="outline"></i>开启班次</button>
<button nz-button nzType="primary" *ngIf="currentClassGroupCountData.status == 1" (click)="getCurrentClassGroupCountData()"><i nz-icon nzType="sync" nzTheme="outline"></i>刷新数据</button>
<button nz-button nzType="primary" *ngIf="currentClassGroupCountData.status == 1" (click)="showSwapClassGroupModal()"><i nz-icon nzType="swap" nzTheme="outline"></i>交接班组</button>
<button nz-button nzType="primary" *ngIf="currentClassGroupCountData.status == 1" (click)="showEndClassGroupConfirm()"><i nz-icon nzType="poweroff" nzTheme="outline"></i>结束班次</button>
</div>
<nz-divider></nz-divider>
<span>历史班次,共计 {{dataObject.total?dataObject.total:0}} 条数据</span>
<div class="operating-button">
<!-- <button nz-button nzType="primary" class="right-btn" (click)="showEditClassGroup(null)"><i nz-icon nzType="plus" nzTheme="outline"></i>添加班组</button>-->
</div>
<!--数组表格 -->
<nz-table #basicTable
[nzData]="dataObject.list"
[nzTotal]="dataObject.total"
[nzFrontPagination]="false"
[nzLoading]="tableLoading"
[nzPageIndex]="whereObject.pageNum"
(nzPageIndexChange)="requestData($event)"
[nzScroll]="{ x: '1150px'}">
<thead>
<tr>
<th nzWidth="80px">班次</th>
<th nzWidth="100px">班组名称</th>
<th nzWidth="100px">开始时间</th>
<th nzWidth="100px">结束时间</th>
<th nzWidth="100px">状态</th>
<th nzWidth="100px" nzRight="0px">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data;let i = index">
<td>{{data.classNum + ' 班'}}</td>
<td>{{data.gasClassGroupName}}</td>
<td>{{data.startTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td>
<span *ngIf="data.endTime != null">{{data.endTime | date : 'yyyy-MM-dd HH:mm:ss'}}</span>
<span *ngIf="data.endTime == null">未结束</span>
</td>
<td>{{data.status | gasClassGroupTaskStatus}}</td>
<td nzRight="0px" class="table-td-operation">
<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 nzDisabled *ngIf="data.status == 1">暂无操作</li>
<li nz-menu-item *ngIf="data.status == 2"><a (click)="showClassGroupTaskDataModal(data)">查看汇总</a></li>
</ul>
</nz-dropdown-menu>
</td>
</tr>
</tbody>
</nz-table>
</div>
<nz-modal [(nzVisible)]="classGroupCountDataModal" nzTitle="班次汇总" (nzOnCancel)="closeClassGroupTaskDataModal()" nzWidth="350px" [nzFooter]="null">
<nz-descriptions [nzColumn]="{ xxl: 1, xl: 1, lg: 1, md: 1, sm: 1, xs: 1 }">
<nz-descriptions-item nzTitle="开始时间">{{classGroupCountData['startTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="结束时间">{{classGroupCountData['endTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</nz-descriptions-item>
<nz-descriptions-item nzTitle="加油金额汇总">{{classGroupCountData['refuelPrice']}} 元</nz-descriptions-item>
<nz-descriptions-item nzTitle="加油笔数汇总">{{classGroupCountData['refuelNum']}} 笔</nz-descriptions-item>
<nz-descriptions-item nzTitle="加油升数汇总">{{classGroupCountData['refuelLiters']}} 升</nz-descriptions-item>
<nz-descriptions-item nzTitle="退款金额汇总">{{classGroupCountData['refundPrice']}} 元</nz-descriptions-item>
<nz-descriptions-item nzTitle="退款笔数汇总">{{classGroupCountData['refundNum']}} 笔</nz-descriptions-item>
<nz-descriptions-item nzTitle="退款升数汇总">{{classGroupCountData['refundLiters']}} 升</nz-descriptions-item>
</nz-descriptions>
<nz-table #oilCountTable [nzData]="classGroupCountData['groupTaskOilCountList']" [nzShowPagination]="false">
<thead>
<tr>
<th>油号</th>
<th>金额</th>
<th>升数</th>
<th>笔数</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let item of oilCountTable.data">
<td>{{ item.oilNo }}#</td>
<td>{{ item.refuelPrice }}元</td>
<td>{{ item.refuelLiters }}升</td>
<td>{{ item.refuelNum }}笔</td>
</tr>
</tbody>
</nz-table>
<div style="width: 100%;text-align: center;margin-top: 10px;">
<button nz-button nzType="primary" (click)="showPrintModal(classGroupCountData)">打印小票</button>
</div>
</nz-modal>
<nz-modal [(nzVisible)]="printModal" nzTitle="选择打印方式" nzWidth="350" (nzOnCancel)="printModal = false" [nzFooter]="null">
<form nz-form>
<nz-form-item>
<nz-form-control>
<button nz-button nzType="primary" nzBlock (click)="showPrintDiv()">热敏打印机</button>
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-control>
<button nz-button nzType="primary" nzBlock (click)="cloudPrint()">云打印机</button>
</nz-form-control>
</nz-form-item>
</form>
</nz-modal>
<nz-modal [(nzVisible)]="startClassGroupModal" nzTitle="开启班次" (nzOnCancel)="closeStartClassGroupModal()" nzWidth="500px" [nzFooter]="null">
<form nz-form [formGroup]="startClassGroupModalForm">
<nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired>班组</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select ngModel="lucy" [nzPlaceHolder]="'请选择班组'" formControlName="gasClassGroupId">
<nz-option *ngFor="let item of classGroupArray" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
<div style="text-align: center;">
<button nz-button nzType="primary" style="width: 150px;" (click)="submitStartClassGroup()">开启</button>
</div>
</form>
</nz-modal>
<nz-modal [(nzVisible)]="swapClassGroupModal" nzTitle="交换班次" (nzOnCancel)="closeSwapClassGroupModal()" nzWidth="500px" [nzFooter]="null">
<form nz-form [formGroup]="swapClassGroupModalForm">
<nz-form-item>
<nz-form-label [nzSpan]="6" nzRequired>班组</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select ngModel="lucy" [nzPlaceHolder]="'请选择班组'" formControlName="gasClassGroupId">
<nz-option *ngFor="let item of classGroupArray" nzValue="{{item.id}}" nzLabel="{{item.name}}"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
<div style="text-align: center;">
<button nz-button nzType="primary" style="width: 150px;" (click)="submitSwapClassGroupConfirm()">交换</button>
</div>
</form>
</nz-modal>

@ -0,0 +1,8 @@
.gas-count-btn {
text-align: center;
margin-top: 15px;
}
.gas-count-btn button {
margin-bottom: 15px;
margin-left: 10px;
}

@ -0,0 +1,388 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {GasClassGroupService} from '../../../services/gas-class-group.service';
import {GasClassGroupTaskService} from '../../../services/gas-class-group-task.service';
import {LocalStorageService} from '../../../services/local-storage.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
@Component({
selector: 'app-gas-class-group-task',
templateUrl: './gas-class-group-task.component.html',
styleUrls: ['./gas-class-group-task.component.scss']
})
export class GasClassGroupTaskComponent implements OnInit {
userInfoObject: object;
dataObject: any = {};
tableLoading = true;
searchForm: FormGroup;
pageNum: number;
whereObject: any = {};
classGroupArray = [];
startClassGroupModal = false;
startClassGroupModalForm: FormGroup;
swapClassGroupModal = false;
swapClassGroupModalForm: FormGroup;
currentClassGroupCountData = {
classNum: '无',
refuelPrice: '0',
refuelNum: '0',
refuelLiters: '0',
refundPrice: '0',
refundNum: '0',
status: null,
};
classGroupCountDataModal = false;
classGroupCountData = {};
printModal = false;
printData = {};
printTaskId: number;
constructor(private modal: NzModalService,
private localStorageService: LocalStorageService, // 数据缓存
private message: NzMessageService,
private gasClassGroupService: GasClassGroupService,
private gasClassGroupTaskService: GasClassGroupTaskService,
private form: FormBuilder) {
this.userInfoObject = this.localStorageService.get(ADMIN_INFO_OBJECT);
}
ngOnInit(): void {
this.searchForm = this.form.group({
name: [null],
principalName: [null],
principalPhone: [null],
});
this.startClassGroupModalForm = this.form.group({
gasId: [null],
gasClassGroupId: [null, [Validators.required]],
});
this.swapClassGroupModalForm = this.form.group({
gasId: [null],
gasClassGroupId: [null, [Validators.required]],
});
this.gasClassGroupService.getClassGroupList({pageNum: 1, pageSize: 9999}, data => {
if (data['return_code'] === '000000') {
this.classGroupArray = data['return_data']['list'];
}
});
this.getCurrentClassGroupCountData();
this.requestData(1);
}
/**
*
*/
requestData(pageNum) {
this.tableLoading = true;
this.whereObject['pageNum'] = pageNum;
this.whereObject['pageSize'] = 10;
this.gasClassGroupTaskService.getClassGroupTaskList(this.whereObject, data => {
if (data['return_code'] === '000000') {
this.dataObject = data['return_data'];
} else {
this.modal.error(data['return_msg']);
}
this.tableLoading = false;
});
}
/**
*
* @param whereObject
*/
search(whereObject: object) {
this.whereObject = whereObject;
this.requestData(1);
}
/**
*
*/
resetForm(): void {
this.searchForm.reset();
}
/**
*
*/
getCurrentClassGroupCountData() {
this.gasClassGroupTaskService.getCurrentClassGroupTask(this.userInfoObject['merchantStore']['id'], data => {
if (data['return_code'] === '000000') {
this.currentClassGroupCountData = data['return_data'];
} else {
this.modal.warning({
nzTitle: '提示',
nzContent: data['return_msg'],
});
}
});
}
/**
*
*/
showStartClassGroupModal() {
this.startClassGroupModal = true;
}
/**
*
*/
closeStartClassGroupModal() {
this.startClassGroupModalForm.reset();
this.startClassGroupModal = false;
}
/**
*
*/
submitStartClassGroup(){
for (const i in this.startClassGroupModalForm.controls) {
this.startClassGroupModalForm.controls[i].markAsDirty();
this.startClassGroupModalForm.controls[i].updateValueAndValidity();
}
if (this.startClassGroupModalForm.status == null || this.startClassGroupModalForm.status !== 'VALID') {
this.modal.warning({
nzTitle: '提示',
nzContent: '请填写所有必填项',
});
return;
}
this.startClassGroupModalForm.value.gasId = this.userInfoObject['merchantStore']['id'];
// 提交数据
this.gasClassGroupTaskService.startGroupTask(this.startClassGroupModalForm.value, data => {
if (data['return_code'] === '000000') {
this.modal.success({
nzTitle: '提示',
nzContent: '操作成功',
});
this.getCurrentClassGroupCountData();
this.requestData(this.whereObject['pageNum']);
this.closeStartClassGroupModal();
} else {
this.modal.warning({
nzTitle: '提示',
nzContent: data['return_msg'],
});
}
});
}
/**
*
*/
showSwapClassGroupModal() {
this.swapClassGroupModal = true;
}
/**
*
*/
closeSwapClassGroupModal() {
this.swapClassGroupModalForm.reset();
this.swapClassGroupModal = false;
}
/**
*
*/
submitSwapClassGroupConfirm() {
this.modal.confirm({
nzTitle: '警告',
nzContent: '确定交换班次吗?',
nzOkText: '是',
nzCancelText: '否',
nzOkType: 'danger',
nzOnOk: () => this.submitSwapClassGroup()
});
}
/**
*
*/
submitSwapClassGroup() {
for (const i in this.swapClassGroupModalForm.controls) {
this.swapClassGroupModalForm.controls[i].markAsDirty();
this.swapClassGroupModalForm.controls[i].updateValueAndValidity();
}
if (this.swapClassGroupModalForm.status == null || this.swapClassGroupModalForm.status !== 'VALID') {
this.modal.warning({
nzTitle: '提示',
nzContent: '请填写所有必填项',
});
return;
}
this.swapClassGroupModalForm.value.gasId = this.userInfoObject['merchantStore']['id'];
// 提交数据
this.gasClassGroupTaskService.swapGroupTask(this.swapClassGroupModalForm.value, data => {
if (data['return_code'] === '000000') {
this.modal.success({
nzTitle: '提示',
nzContent: '操作成功',
});
this.getCurrentClassGroupCountData();
this.requestData(this.whereObject['pageNum']);
this.closeSwapClassGroupModal();
} else {
this.modal.warning({
nzTitle: '提示',
nzContent: data['return_msg'],
});
}
});
}
/**
*
*/
showEndClassGroupConfirm(): void {
this.modal.confirm({
nzTitle: '警告',
nzContent: '确定结束本次班次吗?',
nzOkText: '是',
nzCancelText: '否',
nzOkType: 'danger',
nzOnOk: () => this.endClassGroupData()
});
}
/**
*
*
*/
endClassGroupData() {
this.gasClassGroupTaskService.endGroupTask( { gasId: this.userInfoObject['merchantStore']['id'] }, data => {
if (data['return_code'] === '000000') {
this.requestData(this.whereObject['pageNum']);
this.getCurrentClassGroupCountData();
} else {
this.modal.error({
nzTitle: '提示',
nzContent: data['return_msg']
});
}
});
}
/**
*
*/
showClassGroupTaskDataModal(data: object) {
this.classGroupCountData = JSON.parse(data['dataCount']);
this.printTaskId = data['id'];
this.classGroupCountDataModal = true;
}
/**
*
*/
closeClassGroupTaskDataModal() {
this.classGroupCountDataModal = false;
}
/**
*
* @param data
*/
showPrintModal(data: object) {
this.printData = data;
this.printModal = true;
}
/**
*
*/
cloudPrint() {
this.gasClassGroupTaskService.print(this.printTaskId, dataBack => {
if (dataBack['return_code'] === '000000') {
this.modal.success({
nzTitle: '提示',
nzContent: '操作成功',
});
}
});
}
/**
*
*/
showPrintDiv() {
this.printDiv(this.printData);
}
printDiv(data: object) {
const headstr = '<html><head><title>打印小票</title></head><body>';
const footstr = '</body>';
let newstr = '<div id="div_print" style="font-size: 16px;">\n' +
' <div style="float: left;margin-bottom: 50px;">\n' +
' <div style="line-height: 30px; color:#000;">\n' +
' <span style="font-size: 13px;float: left;width: 100%;margin-left: 90px;">'+data['classNum']+'班结流水</span>\n' +
' </div>\n' +
' <table style="width: 100%;">\n' +
' <tbody>\n' +
' <tr><td style="font-size: xx-small;color: black;">===========================================</td></tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">开始时间:<span>' + new Date(data['startTime']).toLocaleString() + '</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">结束时间:<span>' + new Date(data['endTime']).toLocaleString() + '</span></td>\n' +
' </tr>\n' +
' <tr><td style="font-size: xx-small;color: black;"></td></tr>' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">加油金额汇总:<span>' + data['refuelPrice'] + '元</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">加油笔数汇总:<span>' + data['refuelNum'] + '笔</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">加油升数汇总:<span>' + data['refuelLiters'] + '升</span></td>\n' +
' </tr><br/>\n' +
' <tr><td style="font-size: xx-small;color: black;"></td></tr>' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">退款金额汇总:<span>' + data['refundPrice'] + '元</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">退款笔数汇总:<span>' + data['refundNum'] + '笔</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">退款升数汇总:<span>' + data['refundLiters'] + '升</span></td>\n' +
' </tr>\n' +
' <tr><td style="font-size: xx-small;color: black;"></td></tr>' +
' <tr><td style="font-size: xx-small;color: black;">---------------------收款-------------------</td></tr>\n' +
' <tr><td style="font-size: xx-small;color: black;">油号&ensp; &ensp; &ensp; &ensp; 金额&ensp; &ensp; &ensp; &ensp; 升数&ensp; &ensp; &ensp; &ensp; 笔数</td></tr>\n';
for (let item of data['groupTaskOilCountList']) {
newstr += '<tr><td style="font-size: xx-small;color: black;">' + item['oilNo'] +'#&ensp; &ensp; &ensp; &ensp;'+ item['refuelPrice'] +'元&ensp; &ensp; &ensp; &ensp;'+ item['refuelLiters'] +'升&ensp; &ensp; &ensp; &ensp;'+ item['refuelNum'] +'笔</td></tr>\n';
}
newstr += '<tr><td style="font-size: xx-small;color: black;">===========================================</td></tr>\n' +
' <tr><td style="float: left;font-size: xx-small;color: black;margin-left: 80px;">' + new Date().toLocaleString() +'</td></tr>\n' +
' </tbody>\n' +
' </table>\n' +
' </div>\n' +
'</div>';
const newWindow = window.open('', '');
newWindow.document.write(headstr + newstr + footstr);
newWindow.print();
newWindow.close();
return false;
}
}

@ -0,0 +1,25 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { GasClassGroupRoutingModule } from './gas-class-group-routing.module';
import { GasClassGroupListComponent } from './gas-class-group-list/gas-class-group-list.component';
import { GasClassGroupTaskComponent } from './gas-class-group-task/gas-class-group-task.component';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {AppCommonModule} from '../../app-common.module';
@NgModule({
declarations: [GasClassGroupListComponent, GasClassGroupTaskComponent],
imports: [
CommonModule,
GasClassGroupRoutingModule,
NgZorroAntdModule,
ReactiveFormsModule,
FormsModule,
BreadcrumbModule,
AppCommonModule,
]
})
export class GasClassGroupModule { }

@ -3,13 +3,14 @@ import { CommonModule } from '@angular/common';
import { GasOilPriceRoutingModule } from './gas-oil-price-routing.module';
import { OilPriceOfficialListComponent } from './oil-price-official-list/oil-price-official-list.component';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {AppCommonModule} from '../../app-common.module';
import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
import { OilPriceTaskListComponent } from './oil-price-task-list/oil-price-task-list.component';
import { OilPriceTaskEditComponent } from './oil-price-task-edit/oil-price-task-edit.component';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {NgxEchartsModule} from 'ngx-echarts';
@NgModule({

@ -1,10 +1,10 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {LocalStorageService} from '../../../services/local-storage.service';
import {CommonsService} from '../../../services/commons.service';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {Router} from '@angular/router';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {OilPriceOfficialService} from '../../../services/oil-price/oil-price-official.service';

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute, Router} from '@angular/router';
import {CommonsService} from '../../../services/commons.service';
import {OilPriceTaskService} from '../../../services/oil-price/oil-price-task.service';
import {LocalStorageService} from "../../../services/local-storage.service";

@ -1,10 +1,10 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {LocalStorageService} from '../../../services/local-storage.service';
import {CommonsService} from '../../../services/commons.service';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {Router} from '@angular/router';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {OilPriceTaskService} from '../../../services/oil-price/oil-price-task.service';

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute, Router} from '@angular/router';
import {GasStaffService} from '../../../services/gas-staff.service';
import {CommonsService} from "../../../services/commons.service";
import {ValidatorsService} from "../../../services/validators.service";

@ -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>

@ -1,11 +1,11 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {LocalStorageService} from '../../../services/local-storage.service';
import {OrganizationService} from '../../../services/organization.service';
import {CompanyAccountService} from '../../../services/company-account.service';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {Router} from '@angular/router';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {GasStaffService} from '../../../services/gas-staff.service';
import {CommonsService} from "../../../services/commons.service";
@ -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;
}
}

@ -4,11 +4,11 @@ import { CommonModule } from '@angular/common';
import { GasStaffRoutingModule } from './gas-staff-routing.module';
import { GasStaffListComponent } from './gas-staff-list/gas-staff-list.component';
import { GasStaffEditComponent } from './gas-staff-edit/gas-staff-edit.component';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {AppCommonModule} from '../../app-common.module';
import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
import {NgxEchartsModule} from 'ngx-echarts';
@NgModule({

@ -4,10 +4,10 @@ import { CommonModule } from '@angular/common';
import { GzSinopecRoutingModule } from './gz-sinopec-routing.module';
import { OfflineAssignComponent } from './offline-assign/offline-assign.component';
import { UseOrderComponent } from './use-order/use-order.component';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {AppCommonModule} from '../../app-common.module';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {NgZorroAntdModule} from 'ng-zorro-antd';
@NgModule({
declarations: [OfflineAssignComponent, UseOrderComponent],

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {TyAgentService} from '../../../services/ty-agent.service';
import {CouponService} from "../../../services/coupon.service";
import {environment} from "../../../../environments/environment";

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {CouponService} from '../../../services/coupon.service';
@Component({

@ -2,9 +2,9 @@ import {Component, OnInit} from '@angular/core';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {LocalStorageService} from '../../../services/local-storage.service';
import {IndexService} from '../../../services/index.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {environment} from '../../../../environments/environment';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
@Component({

@ -1,5 +1,5 @@
import { Component, OnInit } from '@angular/core';
import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router';
import {ActivatedRoute} from '@angular/router';
import {Params} from '@angular/router';
import {WebsocketService} from '../../../services/websocket.service';

@ -51,6 +51,7 @@ export class LoginComponent implements OnInit {
}
this.loginService.userLogin(this.loginForm.value, data => {
if (data['return_code'] === '000000') {
data['return_data']['object']['menuList'] = data['return_data']['object']['menuList'].filter(o => o.showOnMobile == 0);
this.store.set(ADMIN_INFO_OBJECT, data['return_data']['object']);
this.store.set(TOKEN, data['return_data']['uniqueCode']);
this.store.set(INIT_FLAG, true);

@ -0,0 +1,138 @@
<!-- start 面包屑 -->
<app-breadcrumb></app-breadcrumb>
<!-- end 面包屑 -->
<!--条件搜索-->
<nz-spin [nzSpinning]="loadingObject.spinning" nzTip="{{loadingObject.msg}}">
<div class="inner-content">
<form nz-form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)">
<div nz-row>
<!-- <div nz-col nzSpan="8" *ngIf="roleType == 5 && adminFlag == 1">
<nz-form-item>
<nz-form-label [nzSpan]="8">所属部门</nz-form-label>
<nz-form-control [nzSpan]="14">
<nz-select nzAllowClear formControlName="orgId">
<nz-option *ngFor="let item of orgArray" 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]="8">油站名称</nz-form-label>
<nz-form-control [nzSpan]="14">
<input nz-input formControlName="gasName" />
</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 formControlName="prestoreType">
<nz-option nzValue="0" nzLabel="非预存"></nz-option>
<nz-option nzValue="1" nzLabel="预存"></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">
<nz-select formControlName="amountsEarlyWarningStatus">
<nz-option nzValue="0" nzLabel="正常"></nz-option>
<nz-option nzValue="1" nzLabel="余额预警"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</div>
</div>
<div nz-row>
<div nz-col nzSpan="24" class="search-button">
<button nz-button nzType="primary"><i nz-icon nzType="search" nzTheme="outline"></i>搜索</button>
<button nz-button nzType="default" (click)="resetForm()"><i nz-icon nzType="reload" nzTheme="outline"></i>重置</button>
</div>
</div>
</form>
</div>
<div class="inner-content">
<span>共计 {{dataObject.total?dataObject.total:0}} 条数据</span>
<div class="operating-button">
</div>
<!--数组表格 -->
<nz-table #basicTable
[nzData]="dataObject.list"
[nzTotal]="dataObject.total"
[nzFrontPagination]="false"
[nzLoading]="tableLoading"
[nzPageIndex]="whereObject.pageNum"
(nzPageIndexChange)="requestData($event)"
[nzScroll]="{ x: '1100px'}">
<thead>
<tr>
<th nzWidth="60px">序号</th>
<th nzWidth="150px">所在公司</th>
<th nzWidth="140px">所在商户</th>
<th nzWidth="200px">油站名称</th>
<th nzWidth="90px">预存类型</th>
<th nzWidth="90px">账户余额</th>
<th nzWidth="90px">预警余额</th>
<th nzWidth="90px">预警状态</th>
<th nzWidth="100px">油站编号</th>
<th nzWidth="150px">油站地址</th>
<th nzWidth="110px">创建时间</th>
<th nzWidth="110px" nzRight="0px">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of basicTable.data;let i = index" style="{{data.amountsEarlyWarningStatus?'color: #aa1111;':''}}">
<td>{{i+1}}</td>
<td>{{data.companyName}}</td>
<td>{{data.storeMerName}}</td>
<td>{{data.storeName}}</td>
<td>{{data.storePrestoreType? '预存' : '非预存'}}</td>
<td>{{data.amounts?'¥'+data.amounts:'无'}}</td>
<td>{{data.amountsEarlyWarning?'¥'+data.amountsEarlyWarning:'无'}}</td>
<td>
<span *ngIf="data.amountsEarlyWarningStatus == null"></span>
<span *ngIf="data.amountsEarlyWarningStatus == 0">正常</span>
<span *ngIf="data.amountsEarlyWarningStatus == 1">余额预警</span>
</td>
<td>{{data.storeKey}}</td>
<td>{{data.storeAddress}}</td>
<td>{{data.storeCreateTime | date : 'yyyy-MM-dd HH:mm:ss'}}</td>
<td nzRight="0px" class="table-td-operation">
<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)="showEarlyWarningModal(data)">余额预警</li>
</ul>
</nz-dropdown-menu>
</td>
</tr>
</tbody>
</nz-table>
</div>
</nz-spin>
<nz-modal [(nzVisible)]="amountsEarlyWarningModal" nzTitle="设置账户余额预警" (nzOnCancel)="closeEarlyWarningModal()" [nzFooter]="null">
<form nz-form [formGroup]="amountsEarlyWarningFrom">
<nz-form-item>
<nz-form-label [nzSpan]="6">预警余额</nz-form-label>
<nz-form-control [nzSpan]="14" nzExtra="预警余额设置为0,代表不需要预警">
<nz-input-number nz-input formControlName="earlyWarning" [nzMin]="0" [nzMax]="99999999" [nzStep]="1" [nzPrecision]="2"></nz-input-number>
</nz-form-control>
</nz-form-item>
</form>
<div style="text-align: center;">
<button nz-button nzType="primary" style="width: 150px;" (click)="submitEarlyWarning()">确定</button>
</div>
</nz-modal>

@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { GasStationListComponent } from './gas-station-list.component';
describe('GasStationListComponent', () => {
let component: GasStationListComponent;
let fixture: ComponentFixture<GasStationListComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ GasStationListComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(GasStationListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

@ -0,0 +1,134 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {LocalStorageService} from '../../../services/local-storage.service';
import {CompanyAccountService} from '../../../services/company-account.service';
import {Router} from '@angular/router';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {IndexService} from '../../../services/index.service';
import {Validators} from '@angular/forms';
import {MerchantStoreService} from "../../../services/merchant-store.service";
@Component({
selector: 'app-gas-station-list',
templateUrl: './gas-station-list.component.html',
styleUrls: ['./gas-station-list.component.scss']
})
export class GasStationListComponent implements OnInit {
FILE_URL = environment.imageUrl;
roleType;
adminFlag;
loadingObject = {
spinning: false,
msg: '加载中'
};
dataObject: any = {};
tableLoading = true;
searchForm: FormGroup;
pageNum: number;
whereObject: any = {};
amountsEarlyWarningFrom: FormGroup;
amountsEarlyWarningModal = false;
constructor(private modal: NzModalService,
private message: NzMessageService,
private store: LocalStorageService,
private indexService: IndexService,
private router: Router,
private form: FormBuilder) {
this.roleType = Number(this.store.get(ADMIN_INFO_OBJECT)['secRole'].roleType);
this.adminFlag = Number(this.store.get(ADMIN_INFO_OBJECT)['secUser'].adminFlag);
}
ngOnInit(): void {
this.searchForm = this.form.group({
companyId: [null],
merId: [null],
gasName: [null],
prestoreType: [null],
amountsEarlyWarningStatus: [null],
});
this.amountsEarlyWarningFrom = this.form.group({
storeId: [null, [Validators.required]],
earlyWarning: [null, [Validators.required]],
});
this.requestData(1);
}
/**
*
*/
requestData(pageNum) {
this.tableLoading = true;
this.whereObject['pageNum'] = pageNum;
this.whereObject['pageSize'] = 10;
this.indexService.getGasSelfBuiltStationList(this.whereObject, data => {
if (data['return_code'] === '000000') {
this.dataObject = data['return_data'];
} else {
this.modal.error(data['return_msg']);
}
this.tableLoading = false;
});
}
/**
*
* @param whereObject
*/
search(whereObject: object) {
this.whereObject = whereObject;
this.requestData(1);
}
/**
*
*/
resetForm(): void {
this.searchForm.reset();
}
showEarlyWarningModal(gasObject: object) {
this.amountsEarlyWarningModal = true;
this.amountsEarlyWarningFrom.patchValue({ storeId: gasObject['storeId'], earlyWarning: gasObject['amountsEarlyWarning']});
}
submitEarlyWarning() {
for (const i in this.amountsEarlyWarningFrom.controls) {
this.amountsEarlyWarningFrom.controls[i].markAsDirty();
this.amountsEarlyWarningFrom.controls[i].updateValueAndValidity();
}
if (this.amountsEarlyWarningFrom.status == null || this.amountsEarlyWarningFrom.status !== 'VALID') {
this.modal.warning({
nzTitle: '提示',
nzContent: '请填写所有必填项',
});
return;
}
this.indexService.setAmountsEarlyWarning(this.amountsEarlyWarningFrom.value, data => {
if (data['return_code'] === '000000') {
this.modal.success({
nzTitle: '提示',
nzContent: '设置成功',
});
this.requestData(this.whereObject['pageNum']);
this.closeEarlyWarningModal();
} else {
this.modal.error({
nzTitle: '提示',
nzContent: data['return_msg'],
});
}
});
}
closeEarlyWarningModal() {
this.amountsEarlyWarningModal = false;
}
}

@ -5,6 +5,7 @@ import {StoreEditComponent} from './store-edit/store-edit.component';
import {StoreDetailComponent} from './store-detail/store-detail.component';
import {OliComponent} from './oli/oli.component';
import {OliGunComponent} from './oli-gun/oli-gun.component';
import {GasStationListComponent} from './gas-station-list/gas-station-list.component';
const routes: Routes = [
@ -13,6 +14,7 @@ const routes: Routes = [
{ path: 'store-detail', component: StoreDetailComponent },
{ path: 'oil', component: OliComponent },
{ path: 'oil_gun', component: OliGunComponent },
{ path: 'gas-station-list', component: GasStationListComponent },
];
@NgModule({

@ -12,10 +12,11 @@ import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import { OliComponent } from './oli/oli.component';
import { OliGunComponent } from './oli-gun/oli-gun.component';
import {AppCommonModule} from "../../app-common.module";
import { GasStationListComponent } from './gas-station-list/gas-station-list.component';
@NgModule({
declarations: [StoreListComponent, StoreEditComponent, StoreDetailComponent, OliComponent, OliGunComponent],
declarations: [StoreListComponent, StoreEditComponent, StoreDetailComponent, OliComponent, OliGunComponent, GasStationListComponent],
imports: [
CommonModule,
MerchantStoreRoutingModule,

@ -1,10 +1,10 @@
import {Component, OnInit} from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {environment} from '../../../../environments/environment';
import {MerchantStoreService} from '../../../services/merchant-store.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute, Router} from '@angular/router';
import {CommonsService} from '../../../services/commons.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {LocalStorageService} from '../../../services/local-storage.service';

@ -94,7 +94,7 @@
</nz-form-control>
</nz-form-item>
</div>
<nz-divider nzText="设备信息"></nz-divider>
<!-- <nz-divider nzText="设备信息"></nz-divider>
<div nz-col [nzSpan]="8">
<nz-form-item>
<nz-form-label [nzFor]="'deviceSn'" >打印机编号</nz-form-label>
@ -118,7 +118,7 @@
<input nz-input placeholder="请输入打印机名称..." [formControlName]="'deviceName'" id="'deviceName'" />
</nz-form-control>
</nz-form-item>
</div>
</div>-->
<nz-divider nzText="定位信息"></nz-divider>
<!-- <div nz-col [nzSpan]="8">-->

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {LocalStorageService} from '../../../services/local-storage.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {OilCardService} from '../../../services/oil-card.service';
@ -8,7 +8,7 @@ import {CompanyAccountService} from '../../../services/company-account.service';
import {OrganizationService} from "../../../services/organization.service";
import {NavigationComponent} from "../../navigation/navigation.component";
import {environment} from "../../../../environments/environment";
import {Router} from "_@angular_router@9.0.7@@angular/router";
import {Router} from "@angular/router";
import {ValidatorsService} from "../../../services/validators.service";
@Component({

@ -1,14 +1,14 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from "_@angular_forms@9.0.7@@angular/forms";
import {NzMessageService, NzModalService} from "_ng-zorro-antd@9.3.0@ng-zorro-antd";
import {LocalStorageService} from "../../../services/local-storage.service";
import {OilCardService} from "../../../services/oil-card.service";
import {OrganizationService} from "../../../services/organization.service";
import {NavigationComponent} from "../../navigation/navigation.component";
import {CompanyAccountService} from "../../../services/company-account.service";
import {ActivatedRoute} from "_@angular_router@9.0.7@@angular/router";
import {ADMIN_INFO_OBJECT} from "../../../services/local-storage.namespace";
import {ADMIN_INFO_OBJECT} from "../../../services/local-storage.namespace";
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {FormBuilder, FormGroup} from "@angular/forms";
import {ActivatedRoute} from "@angular/router";
@Component({
selector: 'app-oil-card-op-record-list',
templateUrl: './oil-card-op-record-list.component.html',

@ -1,12 +1,12 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {LocalStorageService} from '../../../services/local-storage.service';
import {OilCardService} from '../../../services/oil-card.service';
import {OrganizationService} from '../../../services/organization.service';
import {NavigationComponent} from '../../navigation/navigation.component';
import {CompanyAccountService} from '../../../services/company-account.service';
import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router';
import {ActivatedRoute} from '@angular/router';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {environment} from '../../../../environments/environment';

@ -1,13 +1,13 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {LocalStorageService} from '../../../services/local-storage.service';
import {OilCardService} from '../../../services/oil-card.service';
import {OrganizationService} from '../../../services/organization.service';
import {NavigationComponent} from '../../navigation/navigation.component';
import {CompanyAccountService} from '../../../services/company-account.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {ActivatedRoute} from '_@angular_router@9.0.7@@angular/router';
import {ActivatedRoute} from '@angular/router';
@Component({
selector: 'app-oil-card-record-list',

@ -3,11 +3,11 @@ import { CommonModule } from '@angular/common';
import { OilCardRoutingModule } from './oil-card-routing.module';
import { OilCardListComponent } from './oil-card-list/oil-card-list.component';
import {NgZorroAntdModule} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '_@angular_forms@9.0.7@@angular/forms';
import {NgZorroAntdModule} from 'ng-zorro-antd';
import {FormsModule, ReactiveFormsModule} from '@angular/forms';
import {BreadcrumbModule} from '../../common/breadcrumb/breadcrumb.module';
import {AppCommonModule} from '../../app-common.module';
import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
import {NgxEchartsModule} from 'ngx-echarts';
import { OilCardRecordListComponent } from './oil-card-record-list/oil-card-record-list.component';
import { OilCardOpRecordListComponent } from './oil-card-op-record-list/oil-card-op-record-list.component';
import { OilCardOrderComponent } from './oil-card-order/oil-card-order.component';

@ -1,12 +1,12 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {RechargeService} from '../../../services/recharge.service';
import {DiscountService} from '../../../services/discount.service';
import {CouponService} from '../../../services/coupon.service';
import {LocalStorageService} from '../../../services/local-storage.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {NzMessageService} from 'ng-zorro-antd';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {NzModalService} from "ng-zorro-antd";
import {AgentService} from "../../../services/agent.service";

@ -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>

@ -1,10 +1,10 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup} from '@angular/forms';
import {OrderService} from '../../../services/order.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
import {CompanyService} from '../../../services/company.service';
import {MerchantService} from '../../../services/merchant.service';
import {LocalStorageService} from '../../../services/local-storage.service';
@ -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();
@ -195,7 +227,7 @@ export class OilStationOrderComponent implements OnInit {
showPrintDiv() {
const orderId = this.printDataObject.orderId;
const data = this.printDataObject.printData;
data['createTime'] = new Date(data['createTime']).toLocaleString();
data['payTime'] = new Date(data['payTime']).toLocaleString();
this.printDiv(data);
this.orderService.print(orderId, 1, dataBack => {
@ -209,10 +241,10 @@ export class OilStationOrderComponent implements OnInit {
const headstr = '<html><head><title>打印小票</title></head><body>';
const footstr = '</body>';
const newstr = '<div id="div_print" style="font-size: 16px;">\n' +
' <div style="float: left;margin-bottom: 150px;">\n' +
' <div style="float: left;margin-bottom: 50px;">\n' +
' <div style="line-height: 30px; color:#000;">\n' +
' <span style="font-size: 13px;float: left;width: 100%;">' + data['gasName'] + '</span>\n' +
' <span style="font-size: 13px;float: left;width: 100%;margin-left: 60px;">(客户存根)</span>\n' +
' <span style="font-size: 13px;float: left;width: 100%;margin-left: 60px;">(收银员存根)</span>\n' +
' </div>\n' +
' <table style="width: 100%;">\n' +
' <tbody>\n' +
@ -222,45 +254,13 @@ export class OilStationOrderComponent implements OnInit {
' </tr>\n' +
' <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">时间:<span>' + data['createTime'] + '</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">来源:<span>嗨森逛</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">油枪:<span>' + data['gasGunNo'] + '</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">油品:<span>' + data['gasOilNo'] + '</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">升数:<span>' + data['gasOilLiters'] + '升</span></td>\n' +
' <td style="font-size: xx-small;color: black;">打印时间:<span>' + new Date().toLocaleString() + '</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">实际加油升数以油站加油机为准!</td>\n' +
' <td style="font-size: xx-small;color: black;">支付时间:<span>' + data['payTime'] + '</span></td>\n' +
' </tr>\n' +
' <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
' <tr><td style="float: left;margin-top: 10px;font-size: 30px;color: black">加油金额</td></tr>\n' +
' <tr><td style="font-size: 30px;color: black">¥' + data['totalPrice'] + '元</td></tr>\n' +
' <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
' <tr><td style="float: left;font-size: xx-small;color: black;margin-left: 25px;">开心又省钱; 来”嗨森逛“</td></tr>\n' +
' </tbody>\n' +
' </table>\n' +
' </div>\n' +
' <div style="float: left;margin-bottom: 50px;">\n' +
' <div style="line-height: 30px; color:#000;">\n' +
' <span style="font-size: 13px;float: left;width: 100%;">' + data['gasName'] + '</span>\n' +
' <span style="font-size: 13px;float: left;width: 100%;margin-left: 60px;">(收银员存根)</span>\n' +
' </div>\n' +
' <table style="width: 100%;">\n' +
' <tbody>\n' +
' <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">流水号:<span>' + data['orderNo'] + '</span></td>\n' +
' </tr>\n' +
' <tr><td style="font-size: xx-small;color: black;">-------------------------------------------</td></tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">时间:<span>' + data['createTime'] + '</span></td>\n' +
' <td style="font-size: xx-small;color: black;">电话:<span>' + data['merPhone'] + '</span></td>\n' +
' </tr>\n' +
' <tr>\n' +
' <td style="font-size: xx-small;color: black;">来源:<span>嗨森逛</span></td>\n' +

@ -1,10 +1,10 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup} from '@angular/forms';
import {OrderService} from '../../../services/order.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
import {CompanyService} from '../../../services/company.service';
import {MerchantService} from '../../../services/merchant.service';
import {CommonsService} from '../../../services/commons.service';

@ -21,7 +21,7 @@ import { PreOrderComponent } from './pre-order/pre-order.component';
import { PackageRecordListComponent } from './package-record-list/package-record-list.component';
import { DiscountUseConditionListComponent } from './discount-use-condition-list/discount-use-condition-list.component';
import {DicountPackageOrderListComponent} from "./dicount-package-order-list/dicount-package-order-list.component";
import {NzSpaceModule} from "_ng-zorro-antd@9.3.0@ng-zorro-antd/space";
import {NzSpaceModule} from "ng-zorro-antd/space";
import { OilStationOrderComponent } from './oil-station-order/oil-station-order.component';
@NgModule({

@ -1,11 +1,11 @@
import { Component, OnInit } from '@angular/core';
import {environment} from '../../../../environments/environment';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup} from '@angular/forms';
import {CompanyService} from '../../../services/company.service';
import {ActivateService} from '../../../services/activate.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {Router} from '_@angular_router@9.0.7@@angular/router';
import {NzMessageService} from 'ng-zorro-antd';
import {Router} from '@angular/router';
import {CommonsService} from '../../../services/commons.service';
import {DiscountPackageService} from '../../../services/discount-package.service';

@ -61,6 +61,7 @@
</tbody>
</nz-table>
</div>
<!--添加添加弹出层-->
<nz-modal [(nzVisible)]="isVisible" nzTitle="添加" nzWidth="40%" (nzOnCancel)="handleCancel()" (nzOnOk)="handleOk(validateForm.value)">
<form nz-form [formGroup]="validateForm">
@ -146,6 +147,15 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>通知权限</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<nz-select style="width: 100%;" formControlName="roleId" nzShowSearch nzAllowClear nzPlaceHolder="请选择功能标签">
<nz-option *ngFor="let item of userLabelArray" [nzValue]="item.codeValue" [nzLabel]="item.codeName"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</form>
</nz-modal>
@ -235,5 +245,14 @@
</nz-form-control>
</nz-form-item>
<nz-form-item>
<nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>通知权限</nz-form-label>
<nz-form-control [nzSm]="14" [nzXs]="24">
<nz-select style="width: 100%;" formControlName="label" nzMode="multiple" nzShowSearch nzAllowClear nzPlaceHolder="请选择功能标签">
<nz-option *ngFor="let item of userLabelArray" [nzValue]="item.codeValue" [nzLabel]="item.codeName"></nz-option>
</nz-select>
</nz-form-control>
</nz-form-item>
</form>
</nz-modal>

@ -10,6 +10,7 @@ import {ValidatorsService} from '../../../services/validators.service';
import {LocalStorageService} from '../../../services/local-storage.service';
import {environment} from '../../../../environments/environment';
import { ADMIN_INFO_OBJECT } from '../../../services/local-storage.namespace';
import {CommonsService} from "../../../services/commons.service";
@Component({
selector: 'app-system-user',
@ -52,9 +53,12 @@ export class SystemUserComponent implements OnInit {
// tslint:disable-next-line:variable-name
BTN_systemuser_delete;
userLabelArray = [];
constructor(
private location: PlatformLocation, // 路径
private http: HttpClient, // http请求
private commonsService: CommonsService,
private message: NzMessageService, // 信息提示
private fb: FormBuilder, // 表单
private modalService: NzModalService, // 对话框
@ -85,13 +89,18 @@ export class SystemUserComponent implements OnInit {
loginName: [null, [Validators.required, ValidatorsService.minLength(3), ValidatorsService.maxLength(20)]],
password: [null, [Validators.required, ValidatorsService.minLength(6), ValidatorsService.maxLength(40)]],
telephone: [null],
label: [null],
roleId: [null, [Validators.required]],
});
// 调用请求方法
this.goRequest();
// 调用请求政策下拉列表
this.goRequestpoducetList();
this.goRequestCompanyList();
this.getUserLabel();
}
@ -117,6 +126,13 @@ export class SystemUserComponent implements OnInit {
});
}
// 查询用户标签
getUserLabel() {
this.commonsService.getDictionary('USER_LABEL', data => {
this.userLabelArray = data['return_data'];
});
}
// 获取部门列表
goRequestCompanyList() {
this.http.get(this.WEB_SERVE_URL + '/bsOrganization/getOrganizationList?companyId=' + this.store.get(ADMIN_INFO_OBJECT)['bsCompany'].id).subscribe(data => {
@ -193,6 +209,7 @@ export class SystemUserComponent implements OnInit {
password: value.password,
telephone: value.telephone,
roleId: value.roleId,
labelIdArray: value.label
};
this.isOkLoading = true;
this.http.post(this.WEB_SERVE_URL + '/secUser/addUser', params).subscribe(data => {
@ -246,6 +263,7 @@ export class SystemUserComponent implements OnInit {
this.secUser.password = value.password;
this.secUser.telephone = value.telephone;
this.secUser.roleId = value.roleId;
this.secUser.labelIdArray = value.label;
this.http.post(this.WEB_SERVE_URL + '/secUser/editUser', this.secUser).subscribe(data => {
if (data['return_code'] === '000000') {
@ -262,6 +280,7 @@ export class SystemUserComponent implements OnInit {
// 修改取消按钮
handleCancelEdit(): void {
this.validateForm.reset();
this.isVisibleEdit = false;
}
@ -283,6 +302,11 @@ export class SystemUserComponent implements OnInit {
this.http.get(this.WEB_SERVE_URL + '/secUser/getUserView?userId=' + userId).subscribe(data => {
if (data['return_code'] === '000000') {
this.secUser = data['return_data'];
const labelIdArray = [];
for (const labelId of this.secUser['labelIdArray']) {
labelIdArray.push(String(labelId));
}
this.validateForm.patchValue({ label: labelIdArray});
this.avatarImg = data['return_data']['avatar'];
} else {

@ -1,8 +1,8 @@
import {Component, OnInit} from '@angular/core';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {FormBuilder, FormGroup} from '@angular/forms';
import {AuditService} from '../../../services/audit.service';
import {IconService} from '../../../services/icon.service';
import {NzMessageService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {NzMessageService} from 'ng-zorro-antd';
import {CommonsService} from '../../../services/commons.service';
import {ADMIN_INFO_OBJECT} from '../../../services/local-storage.namespace';
import {LocalStorageService} from '../../../services/local-storage.service';

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {TyAgentOilStationService} from '../../../../services/ty-agent-oil-station.service';
import {ADMIN_INFO_OBJECT} from "../../../../services/local-storage.namespace";
import {LocalStorageService} from "../../../../services/local-storage.service";

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {TyAgentService} from '../../../services/ty-agent.service';
import {TyAgentOilStationService} from '../../../services/ty-agent-oil-station.service';
import {Validators} from '@angular/forms';

@ -13,7 +13,7 @@ import { TySalesmanListComponent } from './ty-salesman/ty-salesman-list/ty-sales
import { TySalesmanEditComponent } from './ty-salesman/ty-salesman-edit/ty-salesman-edit.component';
import { OrderStComponent } from './order-st/order-st.component';
import { TyOrderListComponent } from './order/ty-order-list/ty-order-list.component';
import {NgxEchartsModule} from '_ngx-echarts@4.2.2@ngx-echarts';
import {NgxEchartsModule} from 'ngx-echarts';
@NgModule({
declarations: [PetrolStationManageComponent, TyAgentListComponent, TyAgentEditComponent, TySalesmanListComponent, TySalesmanEditComponent, OrderStComponent, TyOrderListComponent],

@ -1,6 +1,6 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {TyAgentService} from '../../../../services/ty-agent.service';
@Component({

@ -1,7 +1,7 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '_@angular_forms@9.0.7@@angular/forms';
import {NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {ActivatedRoute, Router} from '_@angular_router@9.0.7@@angular/router';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {NzModalService} from 'ng-zorro-antd';
import {ActivatedRoute, Router} from '@angular/router';
import {TySalesmanService} from '../../../../services/ty-salesman.service';
@Component({

@ -1,10 +1,10 @@
import { Component, OnInit } from '@angular/core';
import {FormBuilder, FormGroup} from '_@angular_forms@9.0.7@@angular/forms';
import {NzMessageService, NzModalService} from '_ng-zorro-antd@9.3.0@ng-zorro-antd';
import {FormBuilder, FormGroup} from '@angular/forms';
import {NzMessageService, NzModalService} from 'ng-zorro-antd';
import {TySalesmanService} from '../../../../services/ty-salesman.service';
import {ADMIN_INFO_OBJECT} from "../../../../services/local-storage.namespace";
import {LocalStorageService} from "../../../../services/local-storage.service";
import {ActivatedRoute} from "_@angular_router@9.0.7@@angular/router";
import {ActivatedRoute} from "@angular/router";
@Component({
selector: 'app-ty-salesman-list',

@ -48,7 +48,7 @@ import {
GasStaffStatusPipe,
PayStatusPipe,
ChlidRechargeStatusPipe,
SourceTypePipe
SourceTypePipe, GasClassGroupTaskStatusPipe
} from './pipes';
import {OilCardStatusPipe} from './pipes';
import {OilTypePipe} from './pipes/store/oil-type.pipe';
@ -102,6 +102,7 @@ const PIPES = [
PayStatusPipe,
ChlidRechargeStatusPipe,
SourceTypePipe,
GasClassGroupTaskStatusPipe,
];

@ -132,6 +132,11 @@ const routes: Routes = [
loadChildren: () => import('./admin/device/device.module').then(m => m.DeviceModule),
canActivate: [InitGuardService]
},
{
path: 'gas-class-group',
loadChildren: () => import('./admin/gas-class-group/gas-class-group.module').then(m => m.GasClassGroupModule),
canActivate: [InitGuardService]
},
{
path: 'api-product',
loadChildren: () => import('./admin/api-product/api-product.module').then(m => m.ApiProductModule),

@ -0,0 +1,17 @@
import { Pipe, PipeTransform } from '@angular/core';
@Pipe({
name: 'gasClassGroupTaskStatus'
})
export class GasClassGroupTaskStatusPipe implements PipeTransform {
transform(value: number): string {
switch (value) {
case 1:
return '进行中';
case 2:
return '已结束';
}
}
}

@ -38,3 +38,4 @@ export * from './recharge-price/price-status.pipe';
export * from './pay-status.pipe';
export * from './chlid-recharge-status.pipe';
export * from './apiMerchant/source-type.pipe';
export * from './gas-class-group-task/gas-class-group-task-status.pipe';

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';

@ -185,4 +185,10 @@ export class AgentService {
callBack(data);
});
}
public getReceiveLink(id: number, callBack) {
this.http.get(environment.baseUrl + 'discountAgentRel/getReceiveLink?id=' + id).subscribe(data => {
callBack(data);
});
}
}

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import {HttpClient} from "_@angular_common@9.0.7@@angular/common/http";
import {CommonsService} from './commons.service';
import {environment} from "../../environments/environment";
import {HttpClient} from '@angular/common/http';
@Injectable({
providedIn: 'root'

@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';
import {HttpClient} from '@angular/common/http';
@Injectable({
providedIn: 'root'

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';

@ -0,0 +1,100 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';
@Injectable({
providedIn: 'root'
})
export class GasClassGroupTaskService {
constructor(
private http: HttpClient,
private common: CommonsService
) { }
/**
*
*
* @param param
* @param callBack
*/
public startGroupTask(param: object, callBack) {
this.http.post(environment.baseUrl + 'gasClassGroupTask/startGroupTask', param).subscribe(data => {
callBack(data);
});
}
/**
*
*
* @param param
* @param callBack
*/
public endGroupTask(param: object, callBack) {
this.http.post(environment.baseUrl + 'gasClassGroupTask/endGroupTask', param).subscribe(data => {
callBack(data);
});
}
/**
*
*
* @param param
* @param callBack
*/
public swapGroupTask(param: object, callBack) {
this.http.post(environment.baseUrl + 'gasClassGroupTask/swapGroupTask', param).subscribe(data => {
callBack(data);
});
}
/**
*
*
* @param param
* @param callBack
*/
public getClassGroupTaskById(id: number, callBack) {
this.http.get(environment.baseUrl + 'gasClassGroupTask/getClassGroupTaskById?gasClassGroupTaskId=' + id).subscribe(data => {
callBack(data);
});
}
/**
*
*
* @param param
* @param callBack
*/
public getCurrentClassGroupTask(gasId: number, callBack) {
this.http.get(environment.baseUrl + 'gasClassGroupTask/getCurrentClassGroupTask?gasId=' + gasId).subscribe(data => {
callBack(data);
});
}
/**
*
*
* @param param
* @param callBack
*/
public getClassGroupTaskList(param: object, callBack) {
this.http.get(environment.baseUrl + 'gasClassGroupTask/getClassGroupTaskList?' + this.common.getWhereCondition(param)).subscribe(data => {
callBack(data);
});
}
/**
*
*
* @param param
* @param callBack
*/
public print(gasClassGroupTaskId: number, callBack) {
this.http.get(environment.baseUrl + 'gasClassGroupTask/print?gasClassGroupTaskId=' + gasClassGroupTaskId).subscribe(data => {
callBack(data);
});
}
}

@ -0,0 +1,63 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';
@Injectable({
providedIn: 'root'
})
export class GasClassGroupService {
constructor(
private http: HttpClient,
private common: CommonsService
) { }
/**
*
*
* @param param
* @param callBack
*/
public editClassGroup(param: object, callBack) {
this.http.post(environment.baseUrl + 'gasClassGroup/editClassGroup', param).subscribe(data => {
callBack(data);
});
}
/**
*
*
* @param param
* @param callBack
*/
public delClassGroup(groupId: number, callBack) {
this.http.post(environment.baseUrl + 'gasClassGroup/delClassGroup', { id: groupId}).subscribe(data => {
callBack(data);
});
}
/**
* id查询详情
*
* @param groupId id
* @param callBack
*/
public getClassGroupById(groupId: number, callBack) {
this.http.get(environment.baseUrl + 'gasClassGroup/getClassGroupById?groupId=' + groupId).subscribe(data => {
callBack(data);
});
}
/**
*
*
* @param param
* @param callBack
*/
public getClassGroupList(param: Object, callBack) {
this.http.get(environment.baseUrl + 'gasClassGroup/getClassGroupList?' + this.common.getWhereCondition(param)).subscribe(data => {
callBack(data);
});
}
}

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';
@ -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);
});
}
}

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';

@ -66,6 +66,32 @@ export class IndexService {
});
}
/**
* @Author Sum1Dream
* @methodName addHLTBalance
* @Description // 新增余额
* @Date 12:12 2022/1/10
* @Param
*/
public getGasSelfBuiltStationList(params: object, callBack) {
this.http.get(environment.baseUrl + 'highGas/getGasSelfBuiltStationList?' + this.common.getWhereCondition(params)).subscribe(data => {
callBack(data);
});
}
/**
* @Author Sum1Dream
* @methodName addHLTBalance
* @Description // 新增余额
* @Date 12:12 2022/1/10
* @Param
*/
public setAmountsEarlyWarning(params: object, callBack) {
this.http.post(environment.baseUrl + 'merStoreAccount/setAmountsEarlyWarning', params).subscribe(data => {
callBack(data);
});
}
/**
* @Author Sum1Dream
* @methodName queryCompanyAccountInfo2JD

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';

@ -1,7 +1,8 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';
import {HttpClient} from '@angular/common/http';
@Injectable({
providedIn: 'root'

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from './commons.service';
import {environment} from '../../environments/environment';

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import {HttpClient} from '_@angular_common@9.0.7@@angular/common/http';
import {HttpClient} from '@angular/common/http';
import {CommonsService} from '../commons.service';
import {environment} from '../../../environments/environment';

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save