From 9ae9f9894d35a2ff04b186f4c212c08153288f51 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 24 Jan 2022 15:59:51 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bulk-detail/bulk-detail.component.html | 222 ++++++ .../bulk-detail/bulk-detail.component.less | 94 +++ .../bulk-detail/bulk-detail.component.spec.ts | 24 + .../bulk-detail/bulk-detail.component.ts | 120 +++ .../components/bulk/bulk.component.html | 238 ++++++ .../components/bulk/bulk.component.less | 13 + .../components/bulk/bulk.component.spec.ts | 35 + .../components/bulk/bulk.component.ts | 716 ++++++++++++++++++ .../insurance-management-routing.module.ts | 44 ++ .../insurance-management.module.ts | 73 ++ .../services/insurance-management.service.ts | 173 +++++ .../components/bulk/bulk.component.ts | 4 + .../compliance-audit.component.html | 5 +- .../compliance-audit.component.ts | 10 +- .../receipts-audit.component.html | 43 +- .../receipts-audit.component.ts | 60 +- .../services/order-management.service.ts | 8 +- .../components/bulk/bulk.component.ts | 29 +- .../vehicle-detail.component.ts | 15 +- 19 files changed, 1853 insertions(+), 73 deletions(-) create mode 100644 src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.html create mode 100644 src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.less create mode 100644 src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.spec.ts create mode 100644 src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.ts create mode 100644 src/app/routes/insurance-management/components/bulk/bulk.component.html create mode 100644 src/app/routes/insurance-management/components/bulk/bulk.component.less create mode 100644 src/app/routes/insurance-management/components/bulk/bulk.component.spec.ts create mode 100644 src/app/routes/insurance-management/components/bulk/bulk.component.ts create mode 100644 src/app/routes/insurance-management/insurance-management-routing.module.ts create mode 100644 src/app/routes/insurance-management/insurance-management.module.ts create mode 100644 src/app/routes/insurance-management/services/insurance-management.service.ts diff --git a/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.html new file mode 100644 index 00000000..446da77d --- /dev/null +++ b/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.html @@ -0,0 +1,222 @@ + + + + + + +
+ +

订单号: {{ i?.billCode }}

+
+
+
+ + +
+
+ +
+
+ {{ i?.goodsResource?.enterpriseInfoName }} + {{ i?.goodsResource?.shipperAppUserName }} + {{i?.goodsResource?.enterpriseProjectName}} + {{i?.goodsResource?.serviceTypeLabel}} + {{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} + {{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}} +
+ + + + + + + + + + + + +
+ + + +
+
+   +   +   +   +
+
+ + + + + + {{i?.goodsInfoList?.[0]?.goodsName}} + + + + + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + + {{ i?.carModel }}/{{ i?.carLength }} + + {{i?.driverName}}/{{i?.driverPhone}}{{i?.carNo}} + + {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 + + {{i?.loadPlanTime}} + + + {{i?.unloadPlanTime}} + + + {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + + + {{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件 + + + {{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件 + + +
+

装货卸货信息 + ( + + + + ) +

+
+
+
+
+
+
装
+
+

装货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
+
+
+
+
+
+
+
+
卸
+
+

卸货地：{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
+
+
+
+
+
+ + +

{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}（以发货为准，保留小数）

+ + + +
+
+ 总计：{{ totalObj?.price | currency }} （运费￥{{ + totalObj?.price - attObj?.price | currency}}，附加费￥{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%） +
+
+
收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}
+ + + + + + + 查看附件      + 补充协议 + + + + + + + + + + + + + + + + + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} + + + {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} + + {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} + + {{ i?.supplementaryInformationVO?.area }} + + + {{ i?.supplementaryInformationVO?.address }} + + + + + + + + + {{i?.goodsResource?.remarks}} + + + + + +
+ +
+
+ +
+
+ +
+
+ +
+ + + + + + + + + + + \ No newline at end of file diff --git a/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.less new file mode 100644 index 00000000..1d17aeb7 --- /dev/null +++ b/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.less @@ -0,0 +1,94 @@ +:host { + .btn-size { + font-size: 14px; + } + + .bdr { + border-right: 1px solid #ccc; + } + + .bdl { + border-left: 1px solid #ccc; + } + + .source-info { + p { + margin-bottom: .5em; + } + } + + .freight-info-box { + width: 95%; + } + + .freigth-label { + display : inline-block; + width : 50px; + text-align: right; + } + + ::ng-deep { + .approval-status { + .ant-steps { + width : 70%; + margin: 0 auto; + } + } + + // .ant-tabs-top>.ant-tabs-nav, + // .ant-tabs-bottom>.ant-tabs-nav, + // .ant-tabs-top>div>.ant-tabs-nav, + // .ant-tabs-bottom>div>.ant-tabs-nav { + // margin: 0; + // } + + // .ant-anchor-ink::before { + // width: 0; + // } + + // .ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, + // .ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, + // .ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, + // .ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab { + // margin-left: 40px + // } + } + + .leftPadding { + padding-right: 100px; + } + .handling-info { + min-height: 100px; + border: 1px solid #ccc; + + .loading-row { + display: flex; + } + + .handling-info-icon { + width: 32px; + height: 32px; + margin-right: 24px; + color: #fff; + line-height: 32px; + text-align: center; + border-radius: 50%; + + &.loading-bg { + background-color: #50D4AB; + } + + &.unloaing-bg { + background: #F66F6A; + } + } + + .info { + flex: 1; + } + + .time-info { + margin-left: 56px; + } + } +} \ No newline at end of file diff --git a/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.spec.ts b/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.spec.ts new file mode 100644 index 00000000..8556cf2d --- /dev/null +++ b/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.spec.ts @@ -0,0 +1,24 @@ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { OrderManagementBulkeDetailComponent } from './bulk-detail.component'; + +describe('OrderManagementBulkeDetailComponent', () => { + let component: OrderManagementBulkeDetailComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderManagementBulkeDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderManagementBulkeDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.ts new file mode 100644 index 00000000..8419ef3c --- /dev/null +++ b/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.ts @@ -0,0 +1,120 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2021-12-06 20:20:26 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-18 17:18:24 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ +import { Router } from '@angular/router'; +import { Component, OnInit } from '@angular/core'; +import { ActivatedRoute } from '@angular/router'; +import { STColumn } from '@delon/abc/st'; +import { _HttpClient } from '@delon/theme'; +import { NzMessageService } from 'ng-zorro-antd/message'; +import { NzModalService } from 'ng-zorro-antd/modal'; +import { OrderManagementService } from '../../services/order-management.service'; +import { NzCardComponent } from 'ng-zorro-antd/card'; +@Component({ + selector: 'app-supply-management-bulk-detail', + templateUrl: './bulk-detail.component.html', + styleUrls: ['./bulk-detail.component.less'] +}) +export class OrderManagementBulkeDetailComponent implements OnInit { + + + id = this.route.snapshot.params.id; + i: any; + imges: any; + totalObj: any; + attObj: any; + isVisible = false; + logColumns: STColumn[] = [ + { title: '款项', index: 'expenseName' }, + { title: '运输费（元）', index: 'price' }, + { title: '附加费（元）', index: 'surcharge' }, + { title: '支付时间', index: ' paymentTime' }, + { + title: '支付状态', + className: 'text-center', + index: 'paymentStatus', + type: 'badge', + width: '120px', + badge: { + '1': { text: '待申请', color: 'warning' }, + '2': { text: '已支付', color: 'success' }, + '3': { text: '已拒绝', color: 'warning' }, + '4': { text: '申请中', color: 'warning' }, + }, + }, + ]; + + constructor( + private route: ActivatedRoute, + private msgSrv: NzMessageService, + private service: OrderManagementService, + private router: Router, + private modal: NzModalService, + ) { + + } + + ngOnInit(): void { + this.initData() + } + + initData() { + this.service.request(this.service.$api_getBulkBillDetail, {id: this.id}).subscribe(res => { + if (res) { + this.i =res; + this.attObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'ATT')[0]; + this.totalObj = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === 'TOTAL')[0]; + } + }) + } + + + goBack() { + window.history.go(-1); + } + // 修改订单 + changeOrder() { + this.router.navigate(['order-management/bulk-detailChange', this.id]) + } + agreement(value: any) { + if(value === '1') { + this.imges = this.i?.supplementAgreement + } else if (value === '2') { + this.imges = this.i?.supplementAgreement + } + this.isVisible = true; + } + handleCancel() { + this.isVisible = false + } + handleOK() { + this.isVisible = false + } + goDistance(elf: NzCardComponent) { + if (elf) { + elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + } + } + // 取消订单 + cancellation() { + // api_get_cancelAnOrder + this.modal.confirm({ + nzTitle: '确定取消该订单吗?', + nzContent: `取消后无法恢复，请确认`, + nzOnOk: () => + this.service.request(this.service.$api_get_cancelAnOrder, {id: this.id}).subscribe((res) => { + if (res === true) { + this.service.msgSrv.success('操作成功！'); + this.initData(); + } + }), + }) + } +} diff --git a/src/app/routes/insurance-management/components/bulk/bulk.component.html b/src/app/routes/insurance-management/components/bulk/bulk.component.html new file mode 100644 index 00000000..abade9ae --- /dev/null +++ b/src/app/routes/insurance-management/components/bulk/bulk.component.html @@ -0,0 +1,238 @@ + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + +
+ +
+ + + + + + + + + + + + +
+ + + {{ item.freightPrice | currency}} + + +
装 | {{item?.loadPlanTime}}
+
卸 | {{item?.unloadPlanTime}}
+ + +
+ {{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/insurance-management/components/bulk/bulk.component.less b/src/app/routes/insurance-management/components/bulk/bulk.component.less new file mode 100644 index 00000000..149a0bc9 --- /dev/null +++ b/src/app/routes/insurance-management/components/bulk/bulk.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/insurance-management/components/bulk/bulk.component.spec.ts b/src/app/routes/insurance-management/components/bulk/bulk.component.spec.ts new file mode 100644 index 00000000..e78deb02 --- /dev/null +++ b/src/app/routes/insurance-management/components/bulk/bulk.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-18 17:18:06 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.spec.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ + +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { OrderManagementBulkComponent } from './bulk.component'; + +describe('OrderManagementBulkComponent', () => { + let component: OrderManagementBulkComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderManagementBulkComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderManagementBulkComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/insurance-management/components/bulk/bulk.component.ts b/src/app/routes/insurance-management/components/bulk/bulk.component.ts new file mode 100644 index 00000000..6921d239 --- /dev/null +++ b/src/app/routes/insurance-management/components/bulk/bulk.component.ts @@ -0,0 +1,716 @@ +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-supply-management-bulk', + templateUrl: './bulk.component.html', + styleUrls: ['./bulk.component.less'] +}) +export class OrderManagementBulkComponent 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 + }; + const params: any = Object.assign({}, this.reqParams || {}); + delete params.billStatus + this.service.request(this.service.$api_getBulkStatistical, params).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(); + }, 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.OpenPrice(_record), + iif: item => + item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6' + }, + { + text: '查看评价　', + click: _record => this.viewEvaluate(_record), + iif: item => item.billStatus == '5' + }, + { + 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/insurance-management/insurance-management-routing.module.ts b/src/app/routes/insurance-management/insurance-management-routing.module.ts new file mode 100644 index 00000000..86d0b4a5 --- /dev/null +++ b/src/app/routes/insurance-management/insurance-management-routing.module.ts @@ -0,0 +1,44 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-06 09:24:00 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-19 17:10:16 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management-routing.module.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { OrderManagementBulkDetailChangeComponent } from './components/bulk-detail-change/bulk-detail-change.component'; +import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component'; +import { OrderManagementBulkComponent } from './components/bulk/bulk.component'; +import { OrderManagementComplaintDetailComponent } from './components/complaint-detail/complaint-detail.component'; +import { OrderManagementComplaintComponent } from './components/complaint/complaint.component'; +import { OrderManagementComplianceAuditComponent } from './components/compliance-audit/compliance-audit.component'; +import { OrderManagementReceiptsAuditComponent } from './components/receipts-audit/receipts-audit.component'; +import { OrderManagementRiskDetailComponent } from './components/risk-detail/risk-detail.component'; +import { OrderManagementRiskComponent } from './components/risk/risk.component'; +import { OrderManagementVehicleDetailChangeComponent } from './components/vehicle-detail-change/vehicle-detail-change.component'; +import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; +import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component'; + +const routes: Routes = [ + { path: 'vehicle', component: OrderManagementVehicleComponent }, + { path: 'vehicle-detail/:id', component: OrderManagementVehicleDetailComponent }, + { path: 'vehicle-detailChange/:id', component: OrderManagementVehicleDetailChangeComponent }, + { path: 'bulk', component: OrderManagementBulkComponent }, + { path: 'bulk-detail/:id', component: OrderManagementBulkeDetailComponent }, + { path: 'bulk-detailChange/:id', component: OrderManagementBulkDetailChangeComponent }, + { path: 'risk', component: OrderManagementRiskComponent }, + { path: 'risk-detail/:id', component: OrderManagementRiskDetailComponent }, + { path: 'complaint', component: OrderManagementComplaintComponent }, + { path: 'complaint-detail/:id', component: OrderManagementComplaintDetailComponent }, + { path: 'receipts-audit', component: OrderManagementReceiptsAuditComponent }, + { path: 'compliance-audit', component: OrderManagementComplianceAuditComponent }, +] +@NgModule({ + imports: [RouterModule.forChild(routes)], + exports: [RouterModule] +}) +export class OrderManagementRoutingModule { } diff --git a/src/app/routes/insurance-management/insurance-management.module.ts b/src/app/routes/insurance-management/insurance-management.module.ts new file mode 100644 index 00000000..205156ee --- /dev/null +++ b/src/app/routes/insurance-management/insurance-management.module.ts @@ -0,0 +1,73 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2022-01-06 09:24:00 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-21 17:14:17 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management.module.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ + +import { NgModule, Type } from '@angular/core'; +import { SharedModule } from '@shared'; +import { OrderManagementBulkDetailChangeComponent } from './components/bulk-detail-change/bulk-detail-change.component'; +import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component'; +import { OrderManagementBulkComponent } from './components/bulk/bulk.component'; +import { OrderManagementComplaintDetailComponent } from './components/complaint-detail/complaint-detail.component'; +import { OrderManagementComplaintComponent } from './components/complaint/complaint.component'; +import { OrderManagementComplianceAuditComponent } from './components/compliance-audit/compliance-audit.component'; +import { OrderManagementReceiptsAuditComponent } from './components/receipts-audit/receipts-audit.component'; +import { OrderManagementRiskDetailComponent } from './components/risk-detail/risk-detail.component'; +import { OrderManagementRiskComponent } from './components/risk/risk.component'; +import { OrderManagementVehicleDetailChangeComponent } from './components/vehicle-detail-change/vehicle-detail-change.component'; +import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component'; + +import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component'; +import { orderManagementVoucherViewComponent } from './modal/audit/voucher-view/voucher-view.component'; +import { ConfirReceiptComponent } from './modal/bulk/confir-receipt/confir-receipt.component'; +import { UpdateFreightComponent } from './modal/bulk/update-freight/update-freight.component'; +import { OneCarOrderCancelComponent } from './modal/vehicle/cancel/cancel.component'; +import { VehicleConfirReceiptComponent } from './modal/vehicle/confir-receipt/confir-receipt.component'; +import { VehicleFreightPeopleComponent } from './modal/vehicle/freight-people/freight-people.component'; +import { VehicleModifyCaptainComponent } from './modal/vehicle/modify-captain/modify-captain.component'; +import { VehicleModifyRateComponent } from './modal/vehicle/modify-rate/modify-rate.component'; +import { VehicleSureArriveComponent } from './modal/vehicle/sure-arrive/sure-arrive.component'; +import { VehicleSureDepartComponent } from './modal/vehicle/sure-depart/sure-depart.component'; +import { VehicleUpdateFreightComponent } from './modal/vehicle/update-freight/update-freight.component'; +import { OrderManagementRoutingModule } from './order-management-routing.module'; + +const COMPONENTS: Type[] = [ + OrderManagementVehicleComponent, + OrderManagementVehicleDetailComponent, + OrderManagementBulkComponent, + OrderManagementBulkeDetailComponent, + OrderManagementRiskComponent, + OrderManagementComplaintComponent, + UpdateFreightComponent, + ConfirReceiptComponent, + VehicleUpdateFreightComponent, + VehicleConfirReceiptComponent, + VehicleSureDepartComponent, + VehicleSureArriveComponent, + OrderManagementRiskDetailComponent, + OneCarOrderCancelComponent, + OrderManagementVehicleDetailChangeComponent, + OrderManagementBulkDetailChangeComponent, + VehicleModifyRateComponent, + VehicleFreightPeopleComponent, + VehicleModifyCaptainComponent, + OrderManagementComplaintDetailComponent, + OrderManagementReceiptsAuditComponent, + orderManagementVoucherViewComponent, + OrderManagementComplianceAuditComponent +]; + +@NgModule({ + imports: [ + SharedModule, + OrderManagementRoutingModule + ], + declarations: COMPONENTS, +}) +export class OrderManagementModule { } diff --git a/src/app/routes/insurance-management/services/insurance-management.service.ts b/src/app/routes/insurance-management/services/insurance-management.service.ts new file mode 100644 index 00000000..982a0295 --- /dev/null +++ b/src/app/routes/insurance-management/services/insurance-management.service.ts @@ -0,0 +1,173 @@ +/* + * @Description : + * @Version : 1.0 + * @Author : Shiming + * @Date : 2021-12-03 15:31:52 + * @LastEditors : Shiming + * @LastEditTime : 2022-01-24 15:51:26 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\services\\insurance-management.service.ts + * Copyright (C) 2022 huzhenhong. All rights reserved. + */ + +import { Injectable, Injector } from '@angular/core'; +import { EACacheService, ShipperBaseService } from '@shared'; +import { map } from 'rxjs/operators'; + +@Injectable({ + providedIn: 'root' +}) +export class OrderManagementService extends ShipperBaseService { + $api_get_getEnterpriseNetTransHis = `/api/mdc/enterpriseNetTransHis/getEnterpriseNetTransHis`; + $api_get_catalogue_member = `/user?_allow_anonymous=true`; + $api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`; + // 据 手机号/姓名 查询 车队长/司机 + $api_get_getDriverInfo = `/api/mdc/cuc/user/getDriverInfo`; + $api_del_driver = ``; + // 获取货主企业列表 + public $api_getList = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getList?_allow_anonymous=true'; + // 风险单： + // 风险单列表查询 + $api_get_listRiskPage = `/api/sdc/billRiskOperate/listRiskPage`; + // 风险单列表查询 + $api_get_listStatisticalStatus = `/api/sdc/billRiskOperate/listStatisticalStatus`; + // 风险单详情查询 + $api_get_getRiskDetail = `/api/sdc/billRiskOperate/getRiskDetail`; + // 风险单审核 + $api_get_listRisk_audit = `/api/sdc/billRiskOperate/audit`; + // 查询整车订单列表 + $api_get_listWholePage = `/api/sdc/billOperate/listWholePage`; + // 整车详情 + $api_get_getWholeBillDetail = `/api/sdc/billOperate/getWholeBillDetail`; + // 根据车牌号查询车辆信息 + $api_get_getCarLicenseListByCarNo = `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`; + + // 查询大宗订单列表 + $api_get_listBulkPage = `/api/sdc/billOperate/listBulkPage`; + // 查看运费变更记录详情-整车 + $api_get_getChangeRecordWholeDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordWholeDetail`; + // 根据订单ID查看运费变更申请记录 + $api_get_listChangeApply = `/api/sdc/billFreightChangeApplication/listChangeApply`; + // 变更运费页面-整车-整车 + $api_get_getFreightChangeWholeDetail = `/api/sdc/billFreightChangeApplication/getFreightChangeWholeDetail`; + // 订单申请撤销 + $api_get_revokeChangeRecord = `/api/sdc/billFreightChangeApplication/revokeChangeRecord`; + // 运费变更申请-整车 + $api_get_insertFreightChangeWhole = `/api/sdc/billFreightChangeApplication/insertFreightChangeWhole`; + // 取消订单 + $api_get_cancelAnOrder = `/api/sdc/billOperate/cancelAnOrder`; + // 批量签收整车订单 + $api_get_batchSignWholeOrder = `/api/sdc/billOperate/batchSignWholeOrder`; + // 批量签收大宗订单 + $api_get_batchSignBulkOrder = `/api/sdc/billOperate/batchSignBulkOrder`; + // 大宗签收详情 + $api_get_getBulkSignForDetail = `/api/sdc/billOperate/getBulkSignForDetail`; + // 整车签收详情 + $api_get_getWholeSignForDetail = `/api/sdc/billOperate/getWholeSignForDetail`; + // 确认签收大宗订单 + $api_get_signBulkOrder = `/api/sdc/billOperate/signBulkOrder`; + // 确认签收整车订单 + $api_get_signWholeOrder = `/api/sdc/billOperate/signWholeOrder`; + // 上传图片 + public $api_upload_url = `/api/mdc/pbc/upload/multipartFile/file`; + // 根据用户id查用户信息（注意：nickName才是用户名称） + public $api_getUserDetailByAppUserId = `/api/mdc/cuc/userBasicInfo/get`; + // 根据车辆id查车辆信息 + public $api_getCarLicenseByIds = `/api/mdc/cuc/carLicense/getCarLicenseByIds`; + // 统计【整车】订单状态数量 + public $api_statisticalStatus = `/api/sdc/billOperate/getWholeStatistical`; + // 统计【大宗】订单状态数量 + public $api_getBulkStatistical = `/api/sdc/billOperate/getBulkStatistical`; + // 变更运费页面-大宗 + public $api_getFreightChangeBulkDetail = `/api/sdc/billFreightChangeApplication/getFreightChangeBulkDetail`; + // 变更运费页面-大宗 + public $api_insertFreightChangeBulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`; + // 大宗详情 + public $api_getBulkBillDetail = `/api/sdc/billOperate/getBulkBillDetail`; + // 查看运费变更记录详情-大宗 + public $api_getChangeRecordBulkDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordBulkDetail`; + // 查看运费变更记录详情-整车 + public $api_getChangeRecordWholeDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordWholeDetail`; + //运费变更申请计算费用-大宗 + $api_calculate_cost = `/api/sdc/billFreightChangeApplication/getBulkSurchargeDetail`; + //运费变更申请计算费用-整车 + $api_getWholeSurchargeDetail = `/api/sdc/billFreightChangeApplication/getWholeSurchargeDetail`; + //运费变更申请-大宗 + $api_change_bulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`; + // 删除装卸货信息 + $api_delete_Wholedeletebatch = `/api/sdc/unLoadingPlace/deletebatch`; + // 修改-大宗订单 + $api_set_modifyBulkOrder = `/api/sdc/billOperate/modifyBulkOrder`; + // 修改-整车订单 + $api_set_modifyWholeOrder = `/api/sdc/billOperate/modifyWholeOrder`; + // 批量修改网络货运人 + $api_set_updateEnterpriseInfoBatch = `/api/sdc/billOperate/updateEnterpriseInfoBatch`; + // 批量修改附加费率 + $api_set_updateAdditionalRateBatch = `/api/sdc/billOperate/updateAdditionalRateBatch`; + + // 查询投诉列表 + $api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`; + // 获取投诉表详情 + $api_get_getComplaintDriverDetails = `/api/sdc/complaint/operate/getComplaintDriverDetails`; + // 处理投诉 + $api_get_dealWithComplaint = `/api/sdc/complaint/operate/dealWithComplaint`; + // 撤销投诉 + $api_get_canelComplaint = `/api/sdc/complaint/operate/canelComplaint`; + + // 批量修改车队长 + $api_get_updateCarCaptainBatch = `/api/sdc/billOperate/updateCarCaptainBatch`; + // 根据手机号查询车队长/司机 + $api_get_getCarCaptainByMobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`; + + // 获取货主企业列表 + public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; + // 查询系统配置项 + public $api_get_config_item_page = '/api/mdc/pbc/sysConfigItem/list/page'; + + // 查询单据审核 + public $api_get_billExamine_page = '/api/sdc/billExamine/listPage'; + // 单据审核查看凭证 + public $api_get_getCredentials = '/api/sdc/billExamine/getCredentials'; + // 单据审核 + public $api_get_billAudit = '/api/sdc/billExamine/billAudit'; + // 统计单据审核状态数量 + public $api_get_getAuditStatistical = '/api/sdc/billExamine/getAuditStatistical'; + // 修改单据审核 + public $api_get_updateBillExamine = '/api/sdc/billExamine/updateBillExamine'; + // 单据审核通过 + public $api_get_billAuditPass = '/api/sdc/billExamine/billAuditPass'; + + + // 查询规则抽查列表 + public $api_get_listCompliancePage = '/api/sdc/billOperate/listCompliancePage'; + // 规则抽查审批 + public $api_get_updateBillByCompliance = '/api/sdc/billOperate/updateBillByCompliance'; + // 获取规则抽查分类统计 + public $api_get_getComplianceStatisticalStatus = '/api/sdc/billOperate/getComplianceStatisticalStatus'; + + + + /** + * 根据企业ID，获取企业历史网络货运人 + * @returns + */ + getNetworkFreightForwarderHistory(params: any) { + const param = { + enterpriseIds: params.enterpriseInfoIds + }; + return this.request(this.$api_get_getEnterpriseNetTransHis, param).pipe( + map((res: any) => { + if (!res) { + return []; + } + const list = res.map((item: any) => ({ + label: item.networkTransporterName, + value: item.networkTransporterId + })); + return [{ value: '', label: '全部' }, ...list]; + }) + ); + } + constructor(public injector: Injector, public eaCacheSrv: EACacheService) { + super(injector, eaCacheSrv); + } +} 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 6921d239..8e449949 100644 --- a/src/app/routes/order-management/components/bulk/bulk.component.ts +++ b/src/app/routes/order-management/components/bulk/bulk.component.ts @@ -665,6 +665,10 @@ export class OrderManagementBulkComponent implements OnInit { }); } userAction() { + if(this.selectedRows.length <= 0) { + this.service.msgSrv.error('请选择订单！') + return + } let params: any[] = []; this.selectedRows.forEach(item => { params.push(item.id); diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html index 6c8f2ec8..c6ef3eed 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 10:55:27 + * @LastEditTime : 2022-01-24 14:33:59 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\compliance-audit\\compliance-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -78,6 +78,9 @@ {{item.billCode}} +
+ {{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}} +
{{item?.billStatusLabel}}
diff --git a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts index c43c3147..fa01109a 100644 --- a/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts +++ b/src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts @@ -59,8 +59,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { */ get reqParams() { const a: any = {}; - if (this.resourceStatus) { - a.billStatus = this.resourceStatus; + if (this.resourceStatus >= 0) { + a.complianceStatus = this.resourceStatus; } const params: any = Object.assign({}, this.sf?.value || {}); delete params._$expand; @@ -98,8 +98,8 @@ export class OrderManagementComplianceAuditComponent implements OnInit { unstayQuantity: 0 }; const params: any = Object.assign({}, this.reqParams || {}); - delete params.billStatus - this.service.request(this.service.$api_get_getComplianceStatisticalStatus, { ...this.reqParams }).subscribe(res => { + delete params.complianceStatus + this.service.request(this.service.$api_get_getComplianceStatisticalStatus, params).subscribe(res => { if (res) { let totalCount = 0; res.forEach((element: any) => { @@ -117,7 +117,7 @@ export class OrderManagementComplianceAuditComponent implements OnInit { }); } selectChange(e: number) { - this.resourceStatus = e; + this.resourceStatus = e - 1; this.initST(); setTimeout(() => { this.st.load(); 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 index ecf5601f..cc51500b 100644 --- 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-12 10:52:50 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 11:06:06 + * @LastEditTime : 2022-01-24 15:40:10 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -87,6 +87,9 @@ {{item.billCode}} +
+ {{item?.serviceTypeName}} +
{{item?.billStatusLabel}}
@@ -107,45 +110,17 @@

- - -
{{item.no}}
- - -
-

预付：¥200.00

-

到付：¥200.00

-

油卡：¥200.00

-

回单付：¥200.00

-

小计：¥200.00

-

附加费：¥200.00

-
- - - - - -
- -
已选择{{selectedRows?.length || 0}}条订单，确认批量签收吗？ -
-
- 签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。 -
-
-
- + +
\ No newline at end of file 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 index 4533280f..b07044a6 100644 --- 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 @@ -77,7 +77,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { }; const params: any = Object.assign({}, this.reqParams || {}); delete params.billStatus - this.service.request(this.service.$api_get_getAuditStatistical, { ...this.reqParams }).subscribe(res => { + this.service.request(this.service.$api_get_getAuditStatistical, params).subscribe(res => { if (res) { let totalCount = 0; res.forEach((element: any) => { @@ -334,7 +334,7 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { buttons: [ { text: '通过', - click: _record => console.log('1'), + click: _record => this.sign(_record), // iif: item => item.billStatus == '5' }, { @@ -420,14 +420,30 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { this.getGoodsSourceStatistical() }); } - // 取消订单 - cancellation(item: any) { - // api_get_cancelAnOrder + // 通过 + sign(item?: any) { + let params: any = [] + let text = ''; + if(item === '1') { + if(this.selectedRows.length <= 0) { + this.service.msgSrv.error('请选择订单！') + return + } + this.selectedRows.forEach(ite => { + params.push(ite.id); + }); + text = `已选择${this.selectedRows.length}条订单，确认批量通过审核吗？` + } else { + text = `确认通过审核吗？` + params.push(item.id); + } + console.log(this.selectedRows) + console.log(params) this.modal.confirm({ - nzTitle: '确定取消该订单吗?', - nzContent: `取消后无法恢复，请确认`, + nzTitle: text, + nzContent: `通过后不可修改，可以再生成电子单据。`, nzOnOk: () => - this.service.request(this.service.$api_get_cancelAnOrder, { id: item.id }).subscribe(res => { + this.service.request(this.service.$api_get_billAuditPass, params).subscribe(res => { if (res === true) { this.service.msgSrv.success('操作成功！'); this.st?.reload(1); @@ -439,8 +455,30 @@ export class OrderManagementReceiptsAuditComponent implements OnInit { }) }); } - // 修改订单 - changeOrder(value: any) { - this.router.navigate(['order-management/bulk-detailChange', value.id]); + // 批量生成电子单据 + sign1(item?: any) { + if(this.selectedRows.length <= 0) { + this.service.msgSrv.error('请选择订单！') + return + } + let params: any[] = []; + this.selectedRows.forEach(item => { + params.push(item.id); + }); + this.modal.confirm({ + nzTitle: `已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？`, + nzContent: `确认后单据不可修改，请谨慎操作。`, + nzOnOk: () => + this.service.request(this.service.$api_get_cancelAnOrder, { ids: params }).subscribe(res => { + if (res === true) { + this.service.msgSrv.success('操作成功！'); + this.st?.reload(1); + this.getGoodsSourceStatistical(); + this.initST(); + } + this.st?.reload(1); + this.getGoodsSourceStatistical(); + }) + }); } } diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index 53ae803d..feabfbb7 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 09:58:40 + * @LastEditTime : 2022-01-24 15:51:21 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -99,10 +99,6 @@ export class OrderManagementService extends ShipperBaseService { $api_set_modifyBulkOrder = `/api/sdc/billOperate/modifyBulkOrder`; // 修改-整车订单 $api_set_modifyWholeOrder = `/api/sdc/billOperate/modifyWholeOrder`; - // 修改-整车订单详情 - $api_set_getWholeOrderDetail = `/api/sdc/billOperate/getWholeOrderDetail`; - // 修改--大宗订单详情 - $api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`; // 批量修改网络货运人 $api_set_updateEnterpriseInfoBatch = `/api/sdc/billOperate/updateEnterpriseInfoBatch`; // 批量修改附加费率 @@ -138,7 +134,7 @@ export class OrderManagementService extends ShipperBaseService { // 修改单据审核 public $api_get_updateBillExamine = '/api/sdc/billExamine/updateBillExamine'; // 单据审核通过 - public $api_get_billAuditPass = '/api/sdc/billExamine/billAuditPass'; + public $api_get_billAuditPass = '/api/sdc/billExamine/billAuditPassBatch'; // 查询规则抽查列表 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 2ac2e305..9b39a347 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -9,6 +9,7 @@ import { of } from 'rxjs'; import { map } from 'rxjs/operators'; import { SupplyManagementService } from '../../services/supply-management.service'; import { SupplyManagementBulkAssignedCarComponent } from '../assigned-car-bulk/assigned-car-bulk.component'; +import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-famifiar.component'; import { SupplyManagementQrcodePageComponent } from '../qrcode-page/qrcode-page.component'; import { SupplyManagementUpdatePriceComponent } from '../update-price/update-price.component'; @@ -335,19 +336,33 @@ export class SupplyManagementBulkComponent implements OnInit { * 重新指派 */ assignedCar(item: any) { + // const modalRef = this.modal.create({ + // nzTitle: '指派熟车', + // nzWidth: '1500px', + // nzContent: SupplyManagementBulkAssignedCarComponent, + // nzComponentParams: { + // i: item + // }, + // nzFooter: null, + + // }); + // modalRef.afterClose.subscribe((result) => { + // if (result) { + // this.st.reload(); + // } + // }); const modalRef = this.modal.create({ nzTitle: '指派熟车', - nzWidth: '1500px', - nzContent: SupplyManagementBulkAssignedCarComponent, + nzContent: PublishGoodsChooseFamifiarComponent, nzComponentParams: { - i: item + submitParams: item, + submitUrl: this.service.$api_save_bulk_assign }, - nzFooter: null, - + nzWidth: 1300 }); - modalRef.afterClose.subscribe((result) => { + modalRef.afterClose.subscribe(result => { if (result) { - this.st.reload(); + this.st.reload(1); } }); } diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts index a16a9cdc..7676967e 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts @@ -63,7 +63,6 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { ngOnInit(): void { this.getGoodsSourceDetail() - console.log('4444') } getGoodsSourceDetail() { @@ -102,14 +101,12 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { nzTitle: '确定取消货源吗?', nzContent: `取消后不可恢复，谨慎操作`, nzOnOk: () => - console.log('1') - // this.service.request(this.service.$api_cancle_goods_source, {id: record.id}).subscribe(res => { - // if (res === true) { - // this.service.msgSrv.success('操作成功！'); - // this.st?.reload(); - // this.getGoodsSourceStatistical(); - // } - // }) + this.service.request(this.service.$api_cancle_goods_source, { id: this.id }).subscribe(res => { + if (res === true) { + this.service.msgSrv.success('操作成功！'); + this.getGoodsSourceDetail() + } + }) }) } From 9dd6530c5b16b41800d1eae680651e3cfbc1fd61 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 24 Jan 2022 16:09:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/vehicle-detail/vehicle-detail.component.ts | 2 +- .../supply-management/components/vehicle/vehicle.component.ts | 2 +- .../supply-management/services/supply-management.service.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts index 7676967e..a535e01b 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts @@ -152,7 +152,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { i: item, status: 'anew', params: { id }, - url: this.service.$api_save_assign_vehicle, + url: this.service.$api_save_assign_whole, }, nzFooter: null, 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 e84d0a48..8133d6f3 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -174,7 +174,7 @@ export class SupplyManagementVehicleComponent implements OnInit { i: item, status: 'anew', params: { id }, - url: this.service.$api_save_assign_vehicle + url: this.service.$api_save_assign_whole }, nzFooter: null }); diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index 84938452..e89e82b6 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -62,7 +62,7 @@ export class SupplyManagementService extends BaseService { $api_add_car_caption = `/api/mdc/userDriverExpand/addCarCaptainForShiper`; // 设置为车队长 $api_get_goods_resource_shipper = `/api/sdc/goodsResourceShipper/modifyPricePre`; // 修改单价页面根据货源ID获取货物表 $api_get_car_captain_by_mobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`; // 查询车队长或者司机列表 - $api_save_assign_vehicle = `/api/sdc/goodsResourceShipper/reAssignWhole`; // 货主端大宗货源重新指派 + // $api_save_assign_vehicle = `/api/sdc/goodsResourceShipper/reAssignWhole`; // 货主端大宗货源重新指派 $api_save_assign_bulk = `/api/sdc/goodsResourceShipper/reAssignBulk`; // 货主端大宗货源指派熟车 // 整车再下一单指派熟车 From 5ce1b29126ceaeff480b2f7428ec40da0585373e Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 24 Jan 2022 16:37:26 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../update-freight.component.ts | 3 +- .../bulk-detail/bulk-detail.component.html | 1 - .../bulk-detail/bulk-detail.component.ts | 15 ------- .../components/bulk/bulk.component.ts | 39 ------------------- .../vehicle-detail.component.ts | 2 +- .../components/vehicle/vehicle.component.ts | 2 +- .../services/supply-management.service.ts | 4 +- 7 files changed, 6 insertions(+), 60 deletions(-) diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts index 05fcd6d7..494b75b4 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-14 14:03:07 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:21:33 + * @LastEditTime : 2022-01-24 16:28:40 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -205,6 +205,7 @@ export class UpdateFreightComponent implements OnInit { } save(value: any): void { + console.log(this.sf.value) if (!this.sf.valid) { this.sf.validator({ emitError: true }); return; diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index 7189e67c..4f504bc6 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -14,7 +14,6 @@
网络货运人：{{ i?.shipperAppUserName }}
-
diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index ac6c1bb2..9eca7624 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -105,21 +105,6 @@ export class SupplyManagementBulkDetailComponent implements OnInit { // }); } - /** - * 指派熟车 - */ - assignedCar(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '指派熟车', - // nzWidth: '90%', - // nzContent: PublishGoodsChooseFamifiarComponent, - // nzComponentParams: { - // i: this.i, - // }, - // nzFooter: null, - // }); - } - /** * 查看当前指派 */ 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 9b39a347..664a4f5e 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -318,11 +318,6 @@ export class SupplyManagementBulkComponent implements OnInit { text: '再下一单', click: (_record) => this.nextOrder(_record), }, - { - text: '重新指派', - click: (_record) => this.assignedCar(_record), - iif: item => item.auditStatus == 2, - }, ], }, ]; @@ -332,40 +327,6 @@ export class SupplyManagementBulkComponent implements OnInit { // .createStatic(FormEditComponent, { i: { id: 0 } }) // .subscribe(() => this.st.reload()); } - /** - * 重新指派 - */ - assignedCar(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '指派熟车', - // nzWidth: '1500px', - // nzContent: SupplyManagementBulkAssignedCarComponent, - // nzComponentParams: { - // i: item - // }, - // nzFooter: null, - - // }); - // modalRef.afterClose.subscribe((result) => { - // if (result) { - // this.st.reload(); - // } - // }); - const modalRef = this.modal.create({ - nzTitle: '指派熟车', - nzContent: PublishGoodsChooseFamifiarComponent, - nzComponentParams: { - submitParams: item, - submitUrl: this.service.$api_save_bulk_assign - }, - nzWidth: 1300 - }); - modalRef.afterClose.subscribe(result => { - if (result) { - this.st.reload(1); - } - }); - } /** * 查询字段个数 */ diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts index a535e01b..7676967e 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts @@ -152,7 +152,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { i: item, status: 'anew', params: { id }, - url: this.service.$api_save_assign_whole, + url: this.service.$api_save_assign_vehicle, }, nzFooter: null, 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 8133d6f3..e84d0a48 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -174,7 +174,7 @@ export class SupplyManagementVehicleComponent implements OnInit { i: item, status: 'anew', params: { id }, - url: this.service.$api_save_assign_whole + url: this.service.$api_save_assign_vehicle }, nzFooter: null }); diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index e89e82b6..1f1796ee 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 10:57:13 + * @LastEditTime : 2022-01-24 16:36:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -62,7 +62,7 @@ export class SupplyManagementService extends BaseService { $api_add_car_caption = `/api/mdc/userDriverExpand/addCarCaptainForShiper`; // 设置为车队长 $api_get_goods_resource_shipper = `/api/sdc/goodsResourceShipper/modifyPricePre`; // 修改单价页面根据货源ID获取货物表 $api_get_car_captain_by_mobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`; // 查询车队长或者司机列表 - // $api_save_assign_vehicle = `/api/sdc/goodsResourceShipper/reAssignWhole`; // 货主端大宗货源重新指派 + $api_save_assign_vehicle = `/api/sdc/goodsResourceShipper/reAssignWhole`; // 整车货源重新指派 $api_save_assign_bulk = `/api/sdc/goodsResourceShipper/reAssignBulk`; // 货主端大宗货源指派熟车 // 整车再下一单指派熟车 From da1f474e573d64cbebc266f0536f8ff4ed6d1975 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Mon, 24 Jan 2022 16:49:24 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/vehicle/vehicle.component.ts | 13 +- .../update-freight.component.html | 28 +- .../update-freight.component.ts | 262 +++++++++--------- .../services/order-management.service.ts | 10 +- 4 files changed, 163 insertions(+), 150 deletions(-) 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 3a3825a6..46a7f823 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -1,22 +1,17 @@ -import { Router } from '@angular/router'; import { Component, OnInit, ViewChild } from '@angular/core'; +import { Router } from '@angular/router'; import { STColumn, STComponent } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; -import { ModalHelper, _HttpClient } from '@delon/theme'; import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of } from 'rxjs'; import { map } from 'rxjs/operators'; -import { UpdateFreightComponent } from '../../modal/bulk/update-freight/update-freight.component'; -import { OneCarOrderCancelComponent } from '../../modal/vehicle/cancel/cancel.component'; import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receipt/confir-receipt.component'; -import { VehicleSureArriveComponent } from '../../modal/vehicle/sure-arrive/sure-arrive.component'; -import { VehicleSureDepartComponent } from '../../modal/vehicle/sure-depart/sure-depart.component'; -import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freight/update-freight.component'; -import { OrderManagementService } from '../../services/order-management.service'; -import { VehicleModifyRateComponent } from '../../modal/vehicle/modify-rate/modify-rate.component'; import { VehicleFreightPeopleComponent } from '../../modal/vehicle/freight-people/freight-people.component'; import { VehicleModifyCaptainComponent } from '../../modal/vehicle/modify-captain/modify-captain.component'; +import { VehicleModifyRateComponent } from '../../modal/vehicle/modify-rate/modify-rate.component'; +import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freight/update-freight.component'; +import { OrderManagementService } from '../../services/order-management.service'; @Component({ diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html index c31843d5..3daaa236 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html @@ -4,19 +4,39 @@ * @Author : Shiming * @Date : 2021-12-14 14:03:07 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:21:21 + * @LastEditTime : 2022-01-24 16:40:01 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - + + + + + + + + + + + +

总运费：{{ data.totalFreight | currency }}总运费：{{ data.totalFreight |currency }}

-

运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency }}

+

运输费：{{ data.freight |currency }}，附加费：{{ data.surcharge |currency}}

diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts index 494b75b4..a57c0775 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -25,12 +25,16 @@ export class UpdateFreightComponent implements OnInit { @Input() data: any; + freightTypeOptions: any; calculateSub!: Subscription; constructor(private service: OrderManagementService, private modal: NzModalRef) {} ngOnInit(): void { this.schema = this.initSF(this.data); + this.service.getDictByKey('freight:type').subscribe(res => { + this.freightTypeOptions = res; + }); } /** @@ -39,134 +43,122 @@ export class UpdateFreightComponent implements OnInit { private initSF(data: any): SFSchema { return { properties: { - dto: { - type: 'object', - properties: { - freightPrice: { - type: 'number', - title: '运费单价', - minimum: 0, - maximum: 99999, - ui: { - addOnAfter: data.freightTypeLabel, - placeholder: '请输入', - grid: { - span: 12 - }, - change: (val: any) => this.changeNumVal() - } as SFStringWidgetSchema, - default: data.freightPrice - }, - rule: { - title: '', - type: 'string', - default: data.rule, - enum: [ - { label: '保留小数', value: '1' }, - { label: '抹除小数', value: '2' }, - { label: '抹除个数', value: '3' } - ], - ui: { - widget: 'select', - spanLabelFixed: 10, - grid: { - span: 10 - } - } as SFSelectWidgetSchema - }, - settlementBasis: { - title: '结算依据', - type: 'string', - default: data.settlementBasis, - enum: [ - { label: '以收货为准', value: '1' }, - { label: '以发货为准', value: '2' } - ], - ui: { - widget: 'select', - grid: { - span: 12 - } - } as SFSelectWidgetSchema - }, - blank1: { - title: '', - type: 'string', - ui: { widget: 'text', grid: { span: 12 }, class: 'input-back' }, - default: ' ' - }, - freightType: { - title: '', - type: 'string', - ui: { hidden: true }, - default: data.freightType - }, - acceptWeight: { - type: 'number', - title: '装货重量', - default: data.acceptWeight, - minimum: 0, - maximum: 99999, - ui: { - unit: '吨', - placeholder: '请输入', - grid: { - span: 12 - }, - hideStep: true, - change: (val: any) => this.changeNumVal() - } as SFNumberWidgetSchema - }, - acceptVolume: { - type: 'number', - title: '装货体积', - default: data.acceptVolume, - minimum: 0, - maximum: 99999, - ui: { - unit: '吨', - placeholder: '请输入', - grid: { - span: 12 - }, - hideStep: true, - change: (val: any) => this.changeNumVal() - } as SFNumberWidgetSchema - }, - settlementWeight: { - type: 'number', - title: '卸货重量', - default: data.settlementWeight, - minimum: 0, - maximum: 99999, - ui: { - unit: '吨', - placeholder: '请输入', - grid: { - span: 12 - }, - hideStep: true, - change: (val: any) => this.changeNumVal() - } as SFNumberWidgetSchema - }, - settlementVolume: { - type: 'number', - title: '卸货体积', - default: data.settlementVolume, - minimum: 0, - maximum: 99999, - ui: { - unit: '吨', - placeholder: '请输入', - grid: { - span: 12 - }, - hideStep: true, - change: (val: any) => this.changeNumVal() - } as SFNumberWidgetSchema + freightPrice: { + type: 'number', + title: '运费单价', + ui: { + placeholder: '请输入', + widget: 'custom', + grid: { span: 12 }, + change: (val: any) => this.changeNumVal() + } as SFStringWidgetSchema, + default: data.freightPrice + }, + rule: { + title: '', + type: 'string', + default: data.rule, + enum: [ + { label: '保留小数', value: '1' }, + { label: '抹除小数', value: '2' }, + { label: '抹除个数', value: '3' } + ], + ui: { + widget: 'select', + spanLabelFixed: 10, + grid: { + span: 10 } - }, - required: ['freightPrice', 'settlementBasis'] + } as SFSelectWidgetSchema + }, + settlementBasis: { + title: '结算依据', + type: 'string', + default: data.settlementBasis, + ui: { + widget: 'dict-select', + params: { dictKey: 'goodresource:settlement:type' }, + containsAllLabel: false, + placeholder: '结算依据', + errors: { required: '请选择结算依据' }, + grid: {span: 12} + } as SFSelectWidgetSchema + }, + blank1: { + title: '', + type: 'string', + ui: { widget: 'text', grid: { span: 12 }, class: 'input-back' }, + default: ' ' + }, + freightType: { + title: '', + type: 'string', + ui: { hidden: true }, + default: data.freightType + }, + acceptWeight: { + type: 'number', + title: '装货重量', + default: data.loadWeight || 0, + minimum: 0, + maximum: 99999, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + change: (val: any) => this.changeNumVal() + } as SFNumberWidgetSchema + }, + acceptVolume: { + type: 'number', + title: '装货体积', + default: data.loadVolume || 0, + minimum: 0, + maximum: 99999, + ui: { + unit: '方', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + change: (val: any) => this.changeNumVal() + } as SFNumberWidgetSchema + }, + settlementWeight: { + type: 'number', + title: '卸货重量', + default: data.settlementWeight || 0, + minimum: 0, + maximum: 99999, + ui: { + unit: '吨', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + change: (val: any) => this.changeNumVal() + } as SFNumberWidgetSchema + }, + settlementVolume: { + type: 'number', + title: '卸货体积', + default: data.settlementVolume || 0, + minimum: 0, + maximum: 99999, + ui: { + unit: '方', + placeholder: '请输入', + grid: { + span: 12 + }, + hideStep: true, + change: (val: any) => this.changeNumVal() + } as SFNumberWidgetSchema }, changeCause: { title: '审核备注', @@ -182,8 +174,9 @@ export class UpdateFreightComponent implements OnInit { maxRows: 5 } } as SFTextWidgetSchema - } - } + }, + }, + required: ['freightPrice', 'settlementBasis'] }; } @@ -191,9 +184,10 @@ export class UpdateFreightComponent implements OnInit { if (this.calculateSub) { this.calculateSub.unsubscribe(); } + const params = { billId: this.data.billId, changeCause: this.sf.value.changeCause, dto: {...this.sf.value} } this.calculateSub = this.service - .request(this.service.$api_calculate_cost, { billId: this.data.billId, ...this.sf.value, changeCause: '' }) - .subscribe(res => { + .request(this.service.$api_calculate_cost, params) + .subscribe((res: any) => { if (res) { Object.assign(this.data, { totalFreight: res.totalFreight, @@ -205,14 +199,14 @@ export class UpdateFreightComponent implements OnInit { } save(value: any): void { - console.log(this.sf.value) if (!this.sf.valid) { this.sf.validator({ emitError: true }); return; } - this.service.request(this.service.$api_change_bulk, { billId: this.data.billId, ...this.sf.value }).subscribe(res => { + const params = { billId: this.data.billId, changeCause: this.sf.value.changeCause, dto: {...this.sf.value} } + this.service.request(this.service.$api_change_bulk,params).subscribe((res: any) => { if (res) { - this.service.msgSrv.success('变更运费成功'); + this.service.msgSrv.success('变更运费成功！'); this.modal.destroy(true); } }); diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index feabfbb7..02294abf 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 15:51:21 + * @LastEditTime : 2022-01-24 16:39:11 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -144,8 +144,12 @@ export class OrderManagementService extends ShipperBaseService { // 获取规则抽查分类统计 public $api_get_getComplianceStatisticalStatus = '/api/sdc/billOperate/getComplianceStatisticalStatus'; - - + getDictByKey(dictKey: string) { + const params = { dictKey: dictKey }; + return this.request(this.$api_getDictValue, params); + } + // 获取数据字典 + $api_getDictValue = `/api/mdc/pbc/dictItems/getDictValue`; /** * 根据企业ID，获取企业历史网络货运人 * @returns