From dbb0aa089f37010cfb555d9140f72efd0a820ad3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 19 Jan 2022 16:53:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/bulk/bulk.component.ts | 1 - .../receipts-audit.component.html | 238 ++++++ .../receipts-audit.component.less | 13 + .../receipts-audit.component.spec.ts | 35 + .../receipts-audit.component.ts | 715 ++++++++++++++++++ .../components/vehicle/vehicle.component.ts | 1 - .../components/bulk/bulk.component.ts | 3 +- .../components/vehicle/vehicle.component.ts | 3 +- .../components/bulk/bulk.component.ts | 3 +- .../components/vehicle/vehicle.component.ts | 3 +- 10 files changed, 1005 insertions(+), 10 deletions(-) create mode 100644 src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html create mode 100644 src/app/routes/order-management/components/receipts-audit/receipts-audit.component.less create mode 100644 src/app/routes/order-management/components/receipts-audit/receipts-audit.component.spec.ts create mode 100644 src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts diff --git a/src/app/routes/order-management/components/bulk/bulk.component.ts b/src/app/routes/order-management/components/bulk/bulk.component.ts index 76e790ce..7b6c32d7 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -140,7 +140,6 @@ export class OrderManagementBulkComponent implements OnInit { this.initST(); setTimeout(() => { this.st.load(); - this.getGoodsSourceStatistical(); }, 500); } ngOnInit(): void { diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html new file mode 100644 index 00000000..55b04a00 --- /dev/null +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html @@ -0,0 +1,238 @@ + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + +
+ +
+ + + + + + + + + + + + +
+ + + {{ item.freightPrice | currency}} + + +
装 | {{item?.loadingTime}}
+
卸 | {{item?.unloadingTime}}
+ + +
+ {{item?.driverName}}/{{item?.driverPhone}}/{{item?.carNo}} +
+ + +
+ {{item?.payeeName}}/{{item?.payeePhone}} +
+ + + {{item.billCode}} +
+ {{item?.billStatusLabel}} +
+ + +
{{item?.goodsName}}
+
+ {{item?.weight ? item?.weight + '吨/' : '' }} + {{item?.volume ? item?.volume + '方/' : '' }} + {{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }} +
+ + +
+

+ {{ data.expenseName }}：{{ data.price | currency }} + {{ data.paymentStatusLabel }} +

+
+ + + +
{{item.no}}
+ + +
+

预付：¥200.00

+

到付：¥200.00

+

油卡：¥200.00

+

回单付：¥200.00

+

小计：¥200.00

+

附加费：¥200.00

+
+ + +
+ + + + + + + + + {{ index + 1 }} + + +
+ 待确认 + 已确认 + 已撤销 + 拒绝 +
+ + + + + + + + + + + + + + +
+ +
元/吨
+
+ + + + + + {{ item.amountBeforeChange | currency}} + + + ￥{{ item.amountchangeValue | number: '0.2-2'}} + + + {{ item.amountAfterChange | currency}} + + +
变更原因：{{ViewCause?.changeCause}}
+
拒绝原因：{{ViewCause?.refuseCause}}
+
注：附加费依据调整后的运输费用重新计算
+ + + + + + + + + + + +
+ 评分: +
评价内容：
+
+ + +
+ 暂无评价内容 +
+ + + + + + + + + +
+ +
已选择{{selectedRows?.length || 0}}条订单，确认批量签收吗？ +
+
+ 签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。 +
+
+ + +
+ +
+ \ No newline at end of file diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.less b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.less new file mode 100644 index 00000000..149a0bc9 --- /dev/null +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.less @@ -0,0 +1,13 @@ + + :host { + p{ + margin-bottom: 0 + } + .left_btn { + width: 50px; + height: 32px; + padding-left: 8px; + line-height:32px; + background-color: #d7d7d7; + } + } \ No newline at end of file diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.spec.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.spec.ts new file mode 100644 index 00000000..9c92d180 --- /dev/null +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.spec.ts @@ -0,0 +1,35 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2021-12-06 20:03:28 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-19 16:47:34 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.spec.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ + +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { OrderManagementReceiptsAuditComponent } from './receipts-audit.component'; + +describe('OrderManagementReceiptsAuditComponent', () => { + let component: OrderManagementReceiptsAuditComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderManagementReceiptsAuditComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderManagementReceiptsAuditComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts new file mode 100644 index 00000000..7335c537 --- /dev/null +++ b/src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts @@ -0,0 +1,715 @@ +import { Component, OnInit, ViewChild } from '@angular/core'; +import { STColumn, STComponent } from '@delon/abc/st'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { ModalHelper, _HttpClient } from '@delon/theme'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { map } from 'rxjs/operators'; +import { OrderManagementService } from '../../services/order-management.service'; +import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component'; +import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-receipt.component'; +import { of } from 'rxjs'; +import { ShipperBaseService } from '@shared'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'app-order-management-receipts-audit', + templateUrl: './receipts-audit.component.html', + styleUrls: ['./receipts-audit.component.less'] +}) +export class OrderManagementReceiptsAuditComponent implements OnInit { + ui: SFUISchema = {}; + uiView: SFUISchema = {}; + schema: SFSchema = {}; + schemaView: SFSchema = {}; + auditMany = false; + isVisibleView = false; + isVisibleEvaluate = false; + isVisible = false; + _$expand = false; + changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录 + changeViewId: any; // 查看运费变更记录id - 用于查看 + ViewCause: any; // 变更运费查看数据 + sfViewFormData: any; // 变更运费查看的sf 数据 + @ViewChild('st') private readonly st!: STComponent; + @ViewChild('stFloat') private readonly stFloat!: STComponent; + @ViewChild('stFloatView') private readonly stFloatView!: STComponent; + @ViewChild('sf', { static: false }) sf!: SFComponent; + @ViewChild('sfFre', { static: false }) sfFre!: SFComponent; + @ViewChild('sfView', { static: false }) sfView!: SFComponent; + columns: STColumn[] = []; + columnsFloat: STColumn[] = []; + columnsFloatView: STColumn[] = []; + demoValue: any; + resourceStatus: any; + datass: any = [ + { + one: '1', + two: '1', + three: '1', + id: 1 + }, + { + one: '2', + two: '2', + three: '2', + id: 2 + } + ]; + tabs = { + cancelQuantity: 0, + receivedQuantity: 0, + stayQuantity: 0, + signQuantity: 0, + compolatelQuantity: 0, + GoingQuantity: 0, + totalCount: 0 + }; + constructor( + public service: OrderManagementService, + private modal: NzModalService, + public shipperservice: ShipperBaseService, + private router: Router + ) {} + + /** + * 查询参数 + */ + get reqParams() { + const a: any = {}; + if (this.resourceStatus) { + a.billStatus = this.resourceStatus; + } + const params: any = Object.assign({}, this.sf?.value || {}); + delete params._$expand; + return { + ...a, + ...params, + createTime: { + start: this.sf?.value?.createTime?.[0] || '', + end: this.sf?.value?.createTime?.[1] || '' + } + }; + } + get selectedRows() { + return this.st?.list.filter(item => item.checked) || []; + } + get changeParams() { + return { + id: this.changeId + }; + } + search() { + this.st?.load(1); + this.getGoodsSourceStatistical(); + } + getGoodsSourceStatistical() { + this.tabs = { + cancelQuantity: 0, + receivedQuantity: 0, + stayQuantity: 0, + signQuantity: 0, + compolatelQuantity: 0, + GoingQuantity: 0, + totalCount: 0 + }; + this.service.request(this.service.$api_getBulkStatistical, { ...this.reqParams }).subscribe(res => { + if (res) { + let totalCount = 0; + res.forEach((element: any) => { + if (element.billStatusLabel === '待发车') { + this.tabs.stayQuantity = element.quantity; + } else if (element.billStatusLabel === '待接单') { + this.tabs.receivedQuantity = element.quantity; + } else if (element.billStatusLabel === '待签收') { + this.tabs.signQuantity = element.quantity; + } else if (element.billStatusLabel === '已完成') { + this.tabs.compolatelQuantity = element.quantity; + } else if (element.billStatusLabel === '已取消') { + this.tabs.cancelQuantity = element.quantity; + } else if (element.billStatusLabel === '运输中') { + this.tabs.GoingQuantity = element.quantity; + } + totalCount += element.quantity; + }); + this.tabs.totalCount = totalCount; + } + }); + } + selectChange(e: number) { + this.resourceStatus = e; + this.initST(); + setTimeout(() => { + this.st.load(); + this.getGoodsSourceStatistical(); + }, 500); + } + ngOnInit(): void { + this.getGoodsSourceStatistical(); + this.initSF(); + this.initST(); + this.initSTFloat(); + this.initSTFloatView(); + this.initSFView(); + } + + /** + * 初始化查询表单 + */ + initSF() { + this.schema = { + properties: { + _$expand: { type: 'boolean', ui: { hidden: true } }, + billCode: { + type: 'string', + title: '订单号' + }, + resourceCode: { + type: 'string', + title: '货源编号' + }, + shipperAppUserId: { + type: 'string', + title: '货主', + ui: { + widget: 'select', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', + allowClear: true, + onSearch: (q: any) => { + if (!!q) { + return this.service + .request(this.service.$api_enterpriceList, { enterpriseName: q }) + .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .toPromise(); + } else { + return of([]); + } + } + } as SFSelectWidgetSchema + }, + enterpriseProjectId: { + type: 'string', + title: '所属项目', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + asyncData: () => this.service.getEnterpriseProject(), + visibleIf: { + _$expand: (value: boolean) => value + } + }, + default: '' + }, + loadingPlace: { + type: 'string', + title: '装货地', + ui: { + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + dischargePlace: { + type: 'string', + title: '卸货地', + ui: { + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + driverName: { + title: '承运司机', + type: 'string', + ui: { + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + carNo: { + title: '车牌号', + type: 'string', + ui: { + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + carCaptainName: { + title: '车队长', + type: 'string', + ui: { + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + paymentStatus: { + title: '支付状态', + type: 'string', + ui: { + widget: 'dict-select', + params: { dictKey: 'overall:payment:status' }, + containsAllLable: true, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, + createTime: { + title: '创建时间', + type: 'string', + ui: { + widget: 'date', + mode: 'range', + format: 'yyyy-MM-dd', + allowClear: true, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFDateWidgetSchema + }, + riskStatus: { + type: 'string', + title: '是否风险单', + enum: [ + { label: '全部', value: '' }, + { label: '是', value: '3' }, + { label: '否', value: '1' } + ], + ui: { + widget: 'select', + placeholder: '请选择', + visibleIf: { + _$expand: (value: boolean) => value + } + } + }, + enterpriseInfoId: { + type: 'string', + title: '网络货运人', + ui: { + widget: 'select', + placeholder: '请选择', + allowClear: true, + visibleIf: { + _$expand: (value: boolean) => value + }, + asyncData: () => this.shipperservice.getNetworkFreightForwarder() + } + }, + serviceType: { + title: '服务类型', + type: 'string', + default: '', + ui: { + widget: 'dict-select', + params: { dictKey: 'service:type' }, + containsAllLable: true, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, + settlementBasis: { + title: '结算依据', + type: 'string', + ui: { + widget: 'dict-select', + containsAllLable: true, + params: { dictKey: 'goodresource:settlement:type' }, + containAllLable: true, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + } + }, + type: 'object' + }; + this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } }; + } + /** + * 初始化查询表单 + */ + initSFView() { + this.schemaView = { + properties: { + freightPrice: { + type: 'string', + title: '运费单价' + }, + rule: { + title: '', + type: 'string', + ui: { + widget: 'dict-select', + params: { dictKey: 'goodresource:rounding:rules' }, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + }, + settlementBasis: { + type: 'string', + title: '结算重量', + ui: { + widget: 'dict-select', + params: { dictKey: 'goodresource:settlement:type' }, + visibleIf: { + _$expand: (value: boolean) => value + } + } as SFSelectWidgetSchema + } + } + }; + this.uiView = { '*': { spanLabelFixed: 80, grid: { span: 12, gutter: 4 } } }; + } + + /** + * 初始化数据列表 + */ + initST() { + this.columns = [ + { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' }, + { + title: '订单号', + width: '180px', + fixed: 'left', + className: 'text-left', + render: 'billCode' + }, + { + title: '运费明细', + width: '250px', + className: 'text-right', + render: 'mybidDetailInfo' + }, + { title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' }, + { title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' }, + { title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' }, + { title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' }, + { title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' }, + { title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' }, + { + title: '卸货地', + className: 'text-left', + width: '180px', + index: 'unloadingAddressArr' + }, + { + title: '货物信息', + className: 'text-left', + width: '250px', + render: 'goodsName' + }, + { + title: '运费单价', + className: 'text-right', + width: '180px', + render: 'freightPrice' + }, + { + title: '接单数量', + className: 'text-right', + index: 'goodsNumber', + width: '180px' + }, + { + title: '结算重量', + className: 'text-right', + index: 'settlementWeight', + width: '150px' + }, + { + title: '承运司机', + className: 'text-left', + width: '250px', + index: 'driverName', + render: 'driverName' + }, + { + title: '收款人', + className: 'text-left', + width: '180px', + index: 'payeeName', + render: 'payeeName' + }, + { + title: '装卸货时间', + width: '200px', + className: 'text-left', + render: 'loadingTime' + }, + { + title: '创建时间', + width: '180px', + className: 'text-left', + index: 'createTime' + }, + { + title: '操作', + fixed: 'right', + width: '120px', + className: 'text-left', + buttons: [ + { + text: '查看评价　', + click: _record => this.viewEvaluate(_record), + iif: item => item.billStatus == '5' + }, + { + text: '运费变更记录', + click: _record => this.OpenPrice(_record), + iif: item => + item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6' + }, + { + text: '变更运费　', + click: _record => this.updateFreight(_record), + iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' + }, + { + text: '确认签收　', + click: _record => this.confirmReceipt(_record), + iif: item => item.billStatus == '4' + }, + { + text: '取消订单　', + click: _record => this.cancellation(_record), + iif: item => + item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1' + }, + { + text: '修改订单　', + click: _record => this.changeOrder(_record), + iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' + } + ] + } + ]; + } + initSTFloat() { + this.columnsFloat = [ + { + title: '序号', + className: 'text-center', + render: 'order' + }, + { + title: '操作时间', + className: 'text-center', + index: 'applyTime' + }, + { + title: '操作人', + className: 'text-center', + index: 'applyUserName' + }, + { title: '状态', index: 'handleStatusLabel', className: 'text-center' }, + { + title: '操作', + fixed: 'right', + className: 'text-left', + buttons: [ + { + text: '查看', + click: _record => this.FloatView(_record) + }, + // { + // text: '查看协议', + // click: (_record, _modal, _instance) => this.view(_record) + // }, + { + text: '撤销', + click: _record => this.revoke(_record), + iif: item => item.handleStatus === '1' || item.handleStatus === 1 + } + ] + } + ]; + } + initSTFloatView() { + this.columnsFloatView = [ + { + title: '费用名称', + width: '100px', + className: 'text-center', + index: 'costName' + }, + { + title: '变更前', + width: '100px', + className: 'text-center', + index: 'amountAfterChange', + render: 'amountAfterChange' + }, + { title: '变更值', index: 'amountchangeValue', width: '120px', className: 'text-center', render: 'amountchangeValue' }, + { title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' } + ]; + } + /** + * 查询字段个数 + */ + get queryFieldCount(): number { + return Object.keys(this.schema?.properties || {}).length; + } + get changeViewParams() { + return { + id: this.changeViewId + }; + } + /** + * 伸缩查询条件 + */ + expandToggle(): void { + this._$expand = !this._$expand; + this.sf?.setValue('/_$expand', this._$expand); + } + tabChange(item: any) {} + /** + * 重置表单 + */ + resetSF(): void { + this.sf.reset(); + this._$expand = false; + } + + /** + * 导入货源 + */ + importGoodsSource() {} + audit(item: any) {} + + /* + * 审核关闭弹窗 + view: 1 + 浮动费用： 0 + 查看评价： 3 + */ + handleCancel(type: string) { + if (type === '0') { + this.isVisible = false; + } else if (type === '1') { + console.log(type); + this.isVisibleView = false; + } else if (type === '2') { + this.isVisibleEvaluate = false; + } + } + /** + * 审核通过按钮 + */ + handleOK() {} + OpenPrice(item: any) { + this.changeId = item.id; + this.isVisible = true; + } + /** + * 浮动费用查看 + */ + FloatView(item: any) { + this.changeViewId = item.id; + this.service.request(this.service.$api_getChangeRecordBulkDetail, { id: this.changeViewId }).subscribe(res => { + this.ViewCause = res; + }); + this.isVisibleView = true; + } + /** + *查看评价 + */ + viewEvaluate(item: any) { + this.isVisibleEvaluate = true; + } + /** + *变更运费 + */ + updateFreight(item: any) { + this.service.request(this.service.$api_getFreightChangeBulkDetail, { id: item.id }).subscribe(data => { + if (data) { + const modal = this.modal.create({ + nzTitle: '变更运费', + nzWidth: 580, + nzContent: UpdateFreightComponent, + nzComponentParams: { data: { ...data, billId: item.id } }, + nzFooter: null + }); + modal.afterClose.subscribe(_ => { + this.st.reload(1); + this.getGoodsSourceStatistical(); + }); + } + }); + } + + // *确认签收 + + confirmReceipt(item: any) { + const modalRef = this.modal.create({ + nzTitle: '确认签收', + nzWidth: '50%', + nzContent: ConfirReceiptComponent, + nzComponentParams: { + i: item, + Status: 1 + }, + nzFooter: null + }); + modalRef.afterClose.subscribe((result: any) => { + this.st.load(1); + this.getGoodsSourceStatistical(); + }); + } + userAction() { + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.service.request(this.service.$api_get_batchSignBulkOrder, params).subscribe(res => { + if (res) { + this.st.load(1); + this.getGoodsSourceStatistical(); + } + }); + } + // 取消订单 + cancellation(item: any) { + // api_get_cancelAnOrder + this.modal.confirm({ + nzTitle: '确定取消该订单吗?', + nzContent: `取消后无法恢复，请确认`, + nzOnOk: () => + this.service.request(this.service.$api_get_cancelAnOrder, { id: item.id }).subscribe(res => { + if (res === true) { + this.service.msgSrv.success('操作成功！'); + this.st?.reload(1); + this.getGoodsSourceStatistical(); + this.initST(); + } + this.st?.reload(1); + this.getGoodsSourceStatistical(); + }) + }); + } + revoke(item: any) { + this.modal.confirm({ + nzTitle: '是否确定立即撤销费用变更！', + nzOnOk: () => + this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe(res => { + if (res) { + this.service.msgSrv.success('撤销成功！'); + this.stFloat.reload(); + this.st?.reload(1); + this.getGoodsSourceStatistical(); + } + }) + }); + } + // 修改订单 + changeOrder(value: any) { + this.router.navigate(['order-management/bulk-detailChange', value.id]); + } +} diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 23155551..45244384 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -542,7 +542,6 @@ resourceStatus: any; this.initST(); setTimeout(() => { this.st.load(1); - this.getGoodsSourceStatistical() }, 500); } /** diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index 3e1e592c..76242f83 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -399,8 +399,7 @@ export class SupplyManagementBulkComponent implements OnInit { this.resourceStatus = e; this.initST(); setTimeout(() => { - this.st.load(); - this.getGoodsSourceStatistical(); + this.st.load(1); }, 500); } diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index f68c6f87..f3857706 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -118,8 +118,7 @@ export class SupplyManagementVehicleComponent implements OnInit { selectChange(e: number) { this.resourceStatus = e; setTimeout(() => { - this.st.load(); - this.getGoodsSourceStatistical(); + this.st.load(1); }, 500); } diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index f5e54d0b..e7671334 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -364,8 +364,7 @@ tabs = { } this.initST(); setTimeout(() => { - this.st.load(); - this.getGoodsSourceStatistical(); + this.st.load(1); }, 500); } /** diff --git a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts index 91a3d1a1..8aeb29ca 100644 --- a/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/waybill-management/components/vehicle/vehicle.component.ts @@ -363,8 +363,7 @@ export class WaybillManagementVehicleComponent implements OnInit { this.resourceStatus = e; this.initST(); setTimeout(() => { - this.st.load(); - this.getGoodsSourceStatistical(); + this.st.load(1); }, 500); } /**