From f468d98cda3e8777cf3f36c3d948070f84a24ec3 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 25 Jan 2022 17:35:34 +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 --- .../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/list/list.component.html | 114 +++++++++ .../list.component.less} | 0 .../list.component.spec.ts} | 16 +- .../list.component.ts} | 237 +++-------------- .../insurance-management-routing.module.ts | 34 +-- .../insurance-management.module.ts | 60 +---- .../services/insurance-management.service.ts | 153 +---------- src/app/routes/routes-routing.module.ts | 6 +- src/assets/mocks/menu-data.json | 15 ++ 14 files changed, 192 insertions(+), 1141 deletions(-) delete mode 100644 src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.html delete mode 100644 src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.less delete mode 100644 src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.spec.ts delete mode 100644 src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.ts delete mode 100644 src/app/routes/insurance-management/components/bulk/bulk.component.html create mode 100644 src/app/routes/insurance-management/components/list/list.component.html rename src/app/routes/insurance-management/components/{bulk/bulk.component.less => list/list.component.less} (100%) rename src/app/routes/insurance-management/components/{bulk/bulk.component.spec.ts => list/list.component.spec.ts} (52%) rename src/app/routes/insurance-management/components/{bulk/bulk.component.ts => list/list.component.ts} (67%) 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 deleted file mode 100644 index 446da77d..00000000 --- a/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.html +++ /dev/null @@ -1,222 +0,0 @@ - - - - - - -
- -

订单号: {{ 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 deleted file mode 100644 index 1d17aeb7..00000000 --- a/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.less +++ /dev/null @@ -1,94 +0,0 @@ -: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 deleted file mode 100644 index 8556cf2d..00000000 --- a/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.spec.ts +++ /dev/null @@ -1,24 +0,0 @@ -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 deleted file mode 100644 index 8419ef3c..00000000 --- a/src/app/routes/insurance-management/components/bulk-detail/bulk-detail.component.ts +++ /dev/null @@ -1,120 +0,0 @@ -/* - * @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 deleted file mode 100644 index abade9ae..00000000 --- a/src/app/routes/insurance-management/components/bulk/bulk.component.html +++ /dev/null @@ -1,238 +0,0 @@ - - - - - -
- -
- -
- - - -
- -
-
- - - - -
- -
- - - - - - - - - - - - -
- - - {{ 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/list/list.component.html b/src/app/routes/insurance-management/components/list/list.component.html new file mode 100644 index 00000000..8df597b7 --- /dev/null +++ b/src/app/routes/insurance-management/components/list/list.component.html @@ -0,0 +1,114 @@ + + + + + +
+ +
+ +
+ + + +
+ +
+
+ + + + +
+ +
+ + + + + + + + + + + + +
+ + + {{ 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 }} +

+
+ + +
+ + + +
+ +
+ \ 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/list/list.component.less similarity index 100% rename from src/app/routes/insurance-management/components/bulk/bulk.component.less rename to src/app/routes/insurance-management/components/list/list.component.less diff --git a/src/app/routes/insurance-management/components/bulk/bulk.component.spec.ts b/src/app/routes/insurance-management/components/list/list.component.spec.ts similarity index 52% rename from src/app/routes/insurance-management/components/bulk/bulk.component.spec.ts rename to src/app/routes/insurance-management/components/list/list.component.spec.ts index e78deb02..1cb2cef1 100644 --- a/src/app/routes/insurance-management/components/bulk/bulk.component.spec.ts +++ b/src/app/routes/insurance-management/components/list/list.component.spec.ts @@ -4,27 +4,27 @@ * @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 + * @LastEditTime : 2022-01-25 17:22:11 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.spec.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; -import { OrderManagementBulkComponent } from './bulk.component'; +import { insuranceManagementListComponent } from './list.component'; -describe('OrderManagementBulkComponent', () => { - let component: OrderManagementBulkComponent; - let fixture: ComponentFixture; +describe('insuranceManagementListComponent', () => { + let component: insuranceManagementListComponent; + let fixture: ComponentFixture; beforeEach(waitForAsync(() => { TestBed.configureTestingModule({ - declarations: [ OrderManagementBulkComponent ] + declarations: [ insuranceManagementListComponent ] }) .compileComponents(); })); beforeEach(() => { - fixture = TestBed.createComponent(OrderManagementBulkComponent); + fixture = TestBed.createComponent(insuranceManagementListComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/routes/insurance-management/components/bulk/bulk.component.ts b/src/app/routes/insurance-management/components/list/list.component.ts similarity index 67% rename from src/app/routes/insurance-management/components/bulk/bulk.component.ts rename to src/app/routes/insurance-management/components/list/list.component.ts index 6921d239..bbde1287 100644 --- a/src/app/routes/insurance-management/components/bulk/bulk.component.ts +++ b/src/app/routes/insurance-management/components/list/list.component.ts @@ -4,19 +4,17 @@ import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidget 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'; +import { InsuranceManagementService } from '../../services/insurance-management.service'; @Component({ - selector: 'app-supply-management-bulk', - templateUrl: './bulk.component.html', - styleUrls: ['./bulk.component.less'] + selector: 'app-insurance-management-list', + templateUrl: './list.component.html', + styleUrls: ['./list.component.less'] }) -export class OrderManagementBulkComponent implements OnInit { +export class insuranceManagementListComponent implements OnInit { ui: SFUISchema = {}; uiView: SFUISchema = {}; schema: SFSchema = {}; @@ -65,7 +63,7 @@ export class OrderManagementBulkComponent implements OnInit { totalCount: 0 }; constructor( - public service: OrderManagementService, + public service: InsuranceManagementService, private modal: NzModalService, public shipperservice: ShipperBaseService, private router: Router @@ -114,28 +112,28 @@ export class OrderManagementBulkComponent implements OnInit { }; 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; - } - }); + // this.service.request(this.service.$api_getBulkStatistical, params).subscribe((res: any) => { + // 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; @@ -148,9 +146,6 @@ export class OrderManagementBulkComponent implements OnInit { this.getGoodsSourceStatistical(); this.initSF(); this.initST(); - this.initSTFloat(); - this.initSTFloatView(); - this.initSFView(); } /** @@ -457,30 +452,9 @@ export class OrderManagementBulkComponent implements OnInit { 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), + click: _record => console.log(''), iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '1' }, @@ -518,7 +492,7 @@ export class OrderManagementBulkComponent implements OnInit { buttons: [ { text: '查看', - click: _record => this.FloatView(_record) + click: _record => console.log('') }, // { // text: '查看协议', @@ -526,32 +500,13 @@ export class OrderManagementBulkComponent implements OnInit { // }, { text: '撤销', - click: _record => this.revoke(_record), + click: _record => console.log(''), 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' } - ]; - } /** * 查询字段个数 */ @@ -579,136 +534,6 @@ export class OrderManagementBulkComponent implements OnInit { 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 index 86d0b4a5..b591a08c 100644 --- a/src/app/routes/insurance-management/insurance-management-routing.module.ts +++ b/src/app/routes/insurance-management/insurance-management-routing.module.ts @@ -4,41 +4,21 @@ * @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 + * @LastEditTime : 2022-01-25 17:21:54 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\insurance-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'; +import { insuranceManagementListComponent } from './components/list/list.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 }, + { path: 'list', component: insuranceManagementListComponent }, + // { path: 'list-detail/:id', component: OrderManagementVehicleDetailComponent }, ] @NgModule({ imports: [RouterModule.forChild(routes)], exports: [RouterModule] }) -export class OrderManagementRoutingModule { } +export class InsuranceManagementRoutingModule { } diff --git a/src/app/routes/insurance-management/insurance-management.module.ts b/src/app/routes/insurance-management/insurance-management.module.ts index 205156ee..7dc3185e 100644 --- a/src/app/routes/insurance-management/insurance-management.module.ts +++ b/src/app/routes/insurance-management/insurance-management.module.ts @@ -4,70 +4,24 @@ * @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 + * @LastEditTime : 2022-01-25 17:22:04 + * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\insurance-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'; - +import { insuranceManagementListComponent } from './components/list/list.component'; +import { InsuranceManagementRoutingModule } from './insurance-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 + insuranceManagementListComponent ]; @NgModule({ imports: [ SharedModule, - OrderManagementRoutingModule + InsuranceManagementRoutingModule ], declarations: COMPONENTS, }) -export class OrderManagementModule { } +export class InsuranceManagementModule { } diff --git a/src/app/routes/insurance-management/services/insurance-management.service.ts b/src/app/routes/insurance-management/services/insurance-management.service.ts index 982a0295..57150709 100644 --- a/src/app/routes/insurance-management/services/insurance-management.service.ts +++ b/src/app/routes/insurance-management/services/insurance-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-01-24 15:51:26 + * @LastEditTime : 2022-01-25 17:23:04 * @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\services\\insurance-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -16,157 +16,14 @@ 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`; +export class InsuranceManagementService extends ShipperBaseService { + // 获取货主企业列表 + public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; + // 查询大宗订单列表 $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/routes-routing.module.ts b/src/app/routes/routes-routing.module.ts index cb111d43..2585caa1 100644 --- a/src/app/routes/routes-routing.module.ts +++ b/src/app/routes/routes-routing.module.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-13 19:22:47 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:14:25 + * @LastEditTime : 2022-01-25 17:24:24 * @FilePath : \\tms-obc-web\\src\\app\\routes\\routes-routing.module.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -46,6 +46,10 @@ const routes: Routes = [ path: 'supply-management', loadChildren: () => import('./supply-management/supply-management.module').then(m => m.SupplyManagementModule) }, + { + path: 'insurance-management', + loadChildren: () => import('./insurance-management/insurance-management.module').then(m => m.InsuranceManagementModule) + }, { path: 'order-management', loadChildren: () => import('./order-management/order-management.module').then(m => m.OrderManagementModule) diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index 6c80bf59..16e6ef27 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -233,6 +233,21 @@ } ] }, + { + "text": "保险管理", + "icon": { + "type": "iconfont", + "value": "icon-yundan-copy", + "iconfont": "icon-yundan-copy" + }, + "group": true, + "children": [ + { + "text": "保险列表", + "link": "/waybill-management/vehicle" + } + ] + }, { "text": "财务管理", "icon": {