车辆接口更新

This commit is contained in:
wangshiming
2022-01-25 17:35:34 +08:00
parent a5c4458f75
commit f468d98cda
14 changed files with 192 additions and 1141 deletions

View File

@ -1,222 +0,0 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-01-20 19:07:55
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>
</button>
</ng-template>
<ng-template #headerContent>
<div class="mb-xs" nz-row>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.billStatusLabel}}</button>
<h4 class="ml-md" style="font-size: 18px;">订单号: {{ i?.billCode }}</h4>
</div>
<div nz-row style="display: flex; justify-content: end;">
<div nz-col nzSpan="10">
<button (click)="cancellation()" nz-button *ngIf="i?.billStatus == '4' || i?.billStatus == '5' || i?.billStatus == '2' || i?.billStatus == '3' || i?.billStatus == '1'" >取消订单</button>
<button nz-button *ngIf="i?.billStatus == '4' || i?.billStatus == '5' || i?.billStatus == '2' || i?.billStatus == '3'" (click)="changeOrder()">修改订单</button>
</div>
</div>
<nz-divider></nz-divider>
<div>
<div sv-container>
<sv label="网络货运人">{{ i?.goodsResource?.enterpriseInfoName }} </sv>
<sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource?.serviceTypeLabel}}</sv>
<sv label="录单员">{{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} </sv>
<sv label="调度员">{{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchPhone}} </sv>
</div>
<nz-tabset style="margin-top: 15px;">
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
</nz-tab>
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)">
</nz-tab>
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)">
</nz-tab>
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)">
</nz-tab>
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)">
</nz-tab>
</nz-tabset>
</div>
</ng-template>
</page-header-wrapper>
<nz-card nzTitle="运单进度" #distannce1>
<div class="approval-status">
<div style="width: 60%; margin: 0 auto">
  <nz-steps [nzCurrent]="i?.scheduleVOList?.length + 1" nzLabelPlacement="vertical">
  <nz-step
          *ngFor="let item of i?.scheduleVOList"
    [nzTitle]="item.state"
    [nzSubtitle]="item.stateTime"
    [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'"
  >
  </nz-step>
 </nz-steps>
</div>
</div>
</nz-card>
<nz-card nzTitle="基本信息" #distannce2>
<sv-container col="1">
<sv label="货物名称">
{{i?.goodsInfoList?.[0]?.goodsName}}
</sv>
</sv-container>
<sv-container col="2">
<sv label="货物数量">
{{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
</sv>
<sv label="用车需求">{{ i?.carModel }}/{{ i?.carLength }} </sv>
<sv label="承运司机">
{{i?.driverName}}/{{i?.driverPhone}}{{i?.carNo}}
</sv>
<sv label="车型车长载重"> {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 </sv>
<sv label="计划装货时间">
{{i?.loadPlanTime}}
</sv>
<sv label="计划卸货时间">
{{i?.unloadPlanTime}}
</sv>
<sv label="接单数量">
{{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
</sv>
<sv label="装货数量">
{{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
</sv>
<sv label="卸货数量">
{{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件
</sv>
</sv-container>
<div class="mt-md">
<h4 class="text-md">装货卸货信息
<span class="ml-sm text-sm">(
<label>{{i?.loadingCount || '一'}}装</label>
<label>{{i?.unloadingCount || '一'}}卸</label>
</span>
)
</h4>
<div nz-row [nzGutter]="24">
<div nz-col [nzSpan]="12">
<div class="handling-info p-md">
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList">
<div *ngIf="item.type === '1'" class="loading-row">
<div class="handling-info-icon loading-bg"></div>
<div class="info">
<h4>装货地:{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</h4>
<p>联系人:{{item.appUserName}}/{{item.contractTelephone}}</p>
</div>
</div>
</div>
</div>
</div>
<div nz-col [nzSpan]="12">
<div class="handling-info p-md">
<div class="flex" *ngFor="let item of i?.unLoadingPlaceList">
<div *ngIf="item.type === '2'" class="loading-row">
<div class="handling-info-icon unloaing-bg"></div>
<div class="info">
<h4>卸货地:{{item?.province}}{{item.city}}{{item.area}}{{item.detailedAddress}}</h4>
<p>联系人:{{item.appUserName}}/{{item.contractTelephone}}</p>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<h2>{{i?.goodsInfoList?.[0]?.freightPrice}}{{i?.goodsInfoList?.[0]?.freightTypeLabel}}(以发货为准,保留小数)</h2>
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
<div>
<div>
总计:<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span> (运费¥{{
totalObj?.price - attObj?.price | currency}},附加费¥{{ attObj?.price | currency }},附加费率{{i?.attPercent }}%
</div>
</div>
<div>收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>
<sv-container>
<sv label="协议附件">
<!-- {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} -->
<a href="javascript:;" (click)="agreement('1')">查看附件</a> &nbsp;&nbsp;&nbsp;&nbsp;
<a href="javascript:;" (click)="agreement('2')">补充协议</a>
</sv>
</sv-container>
<sv-container col="2" class="mt-md">
<sv label="装货凭证">
<app-imagelist [imgList]="[i?.loadingLadingBillFilePath,i?.loadingPeopleVehiclesGoodsFilePath]">
</app-imagelist>
</sv>
<sv label="卸货凭证">
<app-imagelist [imgList]="[i?.unloadingLadingBillFilePath,i?.unloadingPeopleVehiclesGoodsFilePath]">
</app-imagelist>
</sv>
</sv-container>
</nz-card>
<nz-card nzTitle="补充信息">
<sv-container>
<sv label="是否回单">
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }}
</sv>
<sv label="回单类型">
{{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
</sv>
<sv label="联系人"> {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
<sv label="所在地区">
{{ i?.supplementaryInformationVO?.area }}
</sv>
<sv label="详细地址">
{{ i?.supplementaryInformationVO?.address }}
</sv>
</sv-container>
<sv-container col="1" class="mt-md">
<sv label="回单凭证">
<app-imagelist [imgList]="i?.receiptFilePath"></app-imagelist>
</sv>
<sv label="备注">
{{i?.goodsResource?.remarks}}
</sv>
</sv-container>
</nz-card>
<nz-card>
<div nz-row>
<nz-card nzTitle="轨迹信息" style="width: 100%;" #distannce5>
<div nz-row >
<div nz-col [nzSpan]='12'>
<!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st> -->
</div>
<div nz-col [nzSpan]='12'>
<amap-path-simplifier></amap-path-simplifier>
</div>
</div>
</nz-card>
</div>
</nz-card>
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
<ng-container *nzModalContent>
<app-imagelist [imgList]="imges"></app-imagelist>
</ng-container>
<ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
<button nz-button nzType="default" (click)="handleCancel()">确定 </button>
</ng-template>
</nz-modal>

View File

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

View File

@ -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<OrderManagementBulkeDetailComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ OrderManagementBulkeDetailComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(OrderManagementBulkeDetailComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@ -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: '<b>确定取消该订单吗?</b>',
nzContent: `<b>取消后无法恢复,请确认</b>`,
nzOnOk: () =>
this.service.request(this.service.$api_get_cancelAnOrder, {id: this.id}).subscribe((res) => {
if (res === true) {
this.service.msgSrv.success('操作成功!');
this.initData();
}
}),
})
}
}

View File

@ -1,238 +0,0 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-24 09:53:48
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">
</page-header-wrapper>
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
(formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
</div>
<!-- 查询字段大于3个时根据展开状态调整布局 -->
<ng-container *ngIf="queryFieldCount > 4">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="search()">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading"
>导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</ng-container>
</div>
</nz-card>
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)"
[nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部('+tabs?.totalCount+')'"></nz-tab>
<nz-tab [nzTitle]="'待接单('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.GoingQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px;">
<st
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_listBulkPage"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading"
>
<ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency}}
</ng-template>
<ng-template st-row="loadingTime" let-item let-index="index">
<div *ngIf="item?.loadPlanTime">装 | {{item?.loadPlanTime}}</div>
<div *ngIf="item?.unloadPlanTime">卸 | {{item?.unloadPlanTime}}</div>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div>
{{item?.driverName}}/{{item?.driverPhone}}/{{item?.carNo}}
</div>
</ng-template>
<ng-template st-row="payeeName" let-item let-index="index">
<div>
{{item?.payeeName}}/{{item?.payeePhone}}
</div>
</ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
<div>
<span>{{item?.billStatusLabel}}</span>
</div>
</ng-template>
<ng-template st-row="goodsName" let-item let-index="index">
<div>{{item?.goodsName}}</div>
<div>
<span>{{item?.weight ? item?.weight + '吨/' : '' }}</span>
<span>{{item?.volume ? item?.volume + '方/' : '' }}</span>
<span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
</div>
</ng-template>
<ng-template st-row="mybidDetailInfo" let-item let-index="index">
<div *ngIf="item.mybidDetailInfo.length > 0">
<p *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}{{ data.price | currency }}
<span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
<!-- <ng-template st-row="externalSn" let-item let-index="index">
<span class="mr-xs">{{111111}}</span>
<a (click)="editEnternalSn(item)">编辑</a>
</ng-template> -->
<ng-template st-row="enStatusStr27878" let-item let-index="index">
<div class="mr-xs" nzPopoverTitle="Title" nz-popover [nzPopoverContent]="contentTemplate">{{item.no}}</div>
</ng-template>
<ng-template #contentTemplate>
<div>
<p>预付¥200.00</p>
<p>到付¥200.00</p>
<p>油卡¥200.00</p>
<p>回单付¥200.00</p>
<p>小计¥200.00</p>
<p>附加费¥200.00</p>
</div>
</ng-template>
</st>
</div>
</nz-card>
<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="运费变更记录" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
<ng-container *nzModalContent>
<st
#stFloat
size="small"
[bordered]="true"
[data]="service.$api_get_listChangeApply"
[columns]="columnsFloat"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeParams }"
[res]="{ reName: { list: 'data', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
>
<ng-template st-row="order" let-item let-index="index">
{{ index + 1 }}
</ng-template>
<ng-template st-row="externalSn" let-item let-index="index">
<div>
<span *ngIf="item?.externalSn == '1'">待确认</span>
<span *ngIf="item?.externalSn == '2'">已确认</span>
<span *ngIf="item?.externalSn == '3'">已撤销</span>
<span *ngIf="item?.externalSn == '4'">拒绝</span>
</div>
</ng-template>
</st>
</ng-container>
<ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
<button nz-button nzType="default" (click)="handleCancel('0')">确定</button>
</ng-template>
</nz-modal>
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
<ng-container *nzModalContent>
<sf #sfView [schema]="schemaView" [ui]="uiView" [formData]="ViewCause" [compact]="true" [button]="'none'">
<ng-template sf-template="no" let-me let-ui="uiView" let-schema="schemaView">
<div style="display: flex;">
<nz-input-number [(ngModel)]="demoValue" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
<div class="left_btn">元/吨</div>
</div>
</ng-template>
</sf>
<st
#stFloatView
multiSort
size="small"
[bordered]="true"
[data]="service.$api_getChangeRecordBulkDetail"
[columns]="columnsFloatView"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: changeViewParams }"
[res]="{ reName: { list: 'data.list', total: 'data.total' } }"
>
<ng-template st-row="amountBeforeChange" let-item let-index="index">
{{ item.amountBeforeChange | currency}}
</ng-template>
<ng-template st-row="amountchangeValue" let-item let-index="index">
¥{{ item.amountchangeValue | number: '0.2-2'}}
</ng-template>
<ng-template st-row="amountAfterChange" let-item let-index="index">
{{ item.amountAfterChange | currency}}
</ng-template>
</st>
<div><span>变更原因:{{ViewCause?.changeCause}}</span></div>
<div><span>拒绝原因:{{ViewCause?.refuseCause}}</span></div>
<div><span>注:附加费依据调整后的运输费用重新计算</span></div>
</ng-container>
<ng-template #nzModalFooterview>
<button nz-button nzType="default" (click)="handleCancel('1')">取消</button>
<button nz-button nzType="primary" (click)="handleCancel('1')">确定</button>
</ng-template>
</nz-modal>
<nz-modal [(nzVisible)]="isVisibleEvaluate" [nzWidth]="600" [nzFooter]="nzModalFooterEvaluate" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('2')">
<ng-container *nzModalContent>
<nz-tabset>
<nz-tab nzTitle="我的评价">
<div>
评分: <nz-rate [ngModel]="2.5" nzAllowHalf></nz-rate>
<div><span>评价内容:</span></div>
</div>
</nz-tab>
<nz-tab nzTitle="司机评价">
<div>
暂无评价内容
</div>
</nz-tab>
</nz-tabset>
</ng-container>
<ng-template #nzModalFooterEvaluate>
<button nz-button nzType="default" (click)="handleCancel('2')">取消</button>
<button nz-button nzType="primary" (click)="handleOK()">确定</button>
</ng-template>
</nz-modal>
<ng-template #enable>
<div class="ant-popover-message">
<i nz-icon nzType="info-circle" nzTheme="fill"></i>
<div class="ant-popover-message-title ng-star-inserted self-ant-popover-title" style="font-size: 16px">已选择{{selectedRows?.length || 0}}条订单,确认批量签收吗?
</div>
<div class="ant-popover-message-title ng-star-inserted">
签收后不可再修改运费,请确保运费等信息准确无误后,再进行签收。
</div>
</div>
</ng-template>
<ng-template #extraTemplate>
<div>
<button nz-button nzType="primary" nzGhost nz-popconfirm
[nzPopconfirmTitle]="enable" (nzOnConfirm)="userAction()" nzPopconfirmPlacement="bottomRight">
批量签收
</button>
</div>
</ng-template>

View File

@ -0,0 +1,114 @@
<!--
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-25 17:22:38
* @FilePath : \\tms-obc-web\\src\\app\\routes\\insurance-management\\components\\list\\list.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">
</page-header-wrapper>
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
(formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
</div>
<!-- 查询字段大于3个时根据展开状态调整布局 -->
<ng-container *ngIf="queryFieldCount > 4">
<div nz-col [nzSpan]="_$expand ? 24 : 18">
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="search()">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading"
>导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
</button>
</div>
</ng-container>
</div>
</nz-card>
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)"
[nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部('+tabs?.totalCount+')'"></nz-tab>
<nz-tab [nzTitle]="'待接单('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.GoingQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已取消('+tabs?.cancelQuantity+')'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px;">
<st
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_listBulkPage"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading"
>
<ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency}}
</ng-template>
<ng-template st-row="loadingTime" let-item let-index="index">
<div *ngIf="item?.loadPlanTime">装 | {{item?.loadPlanTime}}</div>
<div *ngIf="item?.unloadPlanTime">卸 | {{item?.unloadPlanTime}}</div>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div>
{{item?.driverName}}/{{item?.driverPhone}}/{{item?.carNo}}
</div>
</ng-template>
<ng-template st-row="payeeName" let-item let-index="index">
<div>
{{item?.payeeName}}/{{item?.payeePhone}}
</div>
</ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
<div>
<span>{{item?.billStatusLabel}}</span>
</div>
</ng-template>
<ng-template st-row="goodsName" let-item let-index="index">
<div>{{item?.goodsName}}</div>
<div>
<span>{{item?.weight ? item?.weight + '吨/' : '' }}</span>
<span>{{item?.volume ? item?.volume + '方/' : '' }}</span>
<span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
</div>
</ng-template>
<ng-template st-row="mybidDetailInfo" let-item let-index="index">
<div *ngIf="item.mybidDetailInfo.length > 0">
<p *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}{{ data.price | currency }}
<span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
</st>
</div>
</nz-card>
<ng-template #extraTemplate>
<div>
<button nz-button nzType="primary" >
批量签收
</button>
</div>
</ng-template>

View File

@ -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<OrderManagementBulkComponent>;
describe('insuranceManagementListComponent', () => {
let component: insuranceManagementListComponent;
let fixture: ComponentFixture<insuranceManagementListComponent>;
beforeEach(waitForAsync(() => {
TestBed.configureTestingModule({
declarations: [ OrderManagementBulkComponent ]
declarations: [ insuranceManagementListComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(OrderManagementBulkComponent);
fixture = TestBed.createComponent(insuranceManagementListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

View File

@ -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: '<b>确定取消该订单吗?</b>',
nzContent: `<b>取消后无法恢复,请确认</b>`,
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: '是否确定立即撤销费用变更!</i>',
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]);

View File

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

View File

@ -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<void>[] = [
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 { }

View File

@ -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);
}

View File

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

View File

@ -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": {