Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop
This commit is contained in:
Taric Xin
@ -0,0 +1,222 @@
|
||||
<!--
|
||||
* @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>
|
||||
<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>
|
||||
@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -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<OrderManagementBulkeDetailComponent>;
|
||||
|
||||
beforeEach(waitForAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ OrderManagementBulkeDetailComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(OrderManagementBulkeDetailComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -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: '<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();
|
||||
}
|
||||
}),
|
||||
})
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,238 @@
|
||||
<!--
|
||||
* @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>
|
||||
@ -0,0 +1,13 @@
|
||||
|
||||
:host {
|
||||
p{
|
||||
margin-bottom: 0
|
||||
}
|
||||
.left_btn {
|
||||
width: 50px;
|
||||
height: 32px;
|
||||
padding-left: 8px;
|
||||
line-height:32px;
|
||||
background-color: #d7d7d7;
|
||||
}
|
||||
}
|
||||
@ -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<OrderManagementBulkComponent>;
|
||||
|
||||
beforeEach(waitForAsync(() => {
|
||||
TestBed.configureTestingModule({
|
||||
declarations: [ OrderManagementBulkComponent ]
|
||||
})
|
||||
.compileComponents();
|
||||
}));
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(OrderManagementBulkComponent);
|
||||
component = fixture.componentInstance;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
});
|
||||
@ -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: '<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]);
|
||||
}
|
||||
}
|
||||
@ -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 { }
|
||||
@ -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<void>[] = [
|
||||
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 { }
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
@ -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);
|
||||
|
||||
@ -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 @@
|
||||
</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?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span>{{item?.billStatusLabel}}</span>
|
||||
</div>
|
||||
|
||||
@ -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();
|
||||
|
||||
@ -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 @@
|
||||
</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?.serviceTypeName}}</span>
|
||||
</div>
|
||||
<div>
|
||||
<span>{{item?.billStatusLabel}}</span>
|
||||
</div>
|
||||
@ -107,45 +110,17 @@
|
||||
</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>
|
||||
|
||||
|
||||
|
||||
|
||||
<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 nz-button nzType="primary" (click)="sign('1')">
|
||||
批量签收
|
||||
</button> -->
|
||||
</button>
|
||||
<button nz-button nzType="primary" (click)="sign1('1')">
|
||||
批量生成电子单据
|
||||
</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
@ -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 = `<b>已选择${this.selectedRows.length}条订单，确认批量通过审核吗？</b>`
|
||||
} else {
|
||||
text = `<b>确认通过审核吗？</b>`
|
||||
params.push(item.id);
|
||||
}
|
||||
console.log(this.selectedRows)
|
||||
console.log(params)
|
||||
this.modal.confirm({
|
||||
nzTitle: '<b>确定取消该订单吗?</b>',
|
||||
nzContent: `<b>取消后无法恢复，请确认</b>`,
|
||||
nzTitle: text,
|
||||
nzContent: `<b>通过后不可修改，可以再生成电子单据。</b>`,
|
||||
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: `<b>已选择${this.selectedRows.length}条订单，确认批量生成电子单据吗？</b>`,
|
||||
nzContent: `<b>确认后单据不可修改，请谨慎操作。</b>`,
|
||||
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();
|
||||
})
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -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({
|
||||
|
||||
@ -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.
|
||||
-->
|
||||
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span: 24 } } }" [button]="'none'"> </sf>
|
||||
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span: 24 } } }" [button]="'none'">
|
||||
<ng-template sf-template="freightPrice" let-i let-ui="ui">
|
||||
<nz-input-group [nzAddOnAfter]="addOnAfterTemplate">
|
||||
<input
|
||||
nz-input
|
||||
type="number"
|
||||
min="0"
|
||||
step="0.01"
|
||||
[ngModel]="i.value"
|
||||
(ngModelChange)="i.setValue($event)"
|
||||
placeholder="请输入"
|
||||
oninput="if(value>99999)value=99999;if(value<0)value=0"
|
||||
/>
|
||||
</nz-input-group>
|
||||
<ng-template #addOnAfterTemplate>
|
||||
<nz-select [ngModel]="sf.value.freightType" (ngModelChange)="sf.setValue('/freightType', $event)" [nzDisabled]="true">
|
||||
<nz-option [nzValue]="item.value" [nzLabel]="item.label" *ngFor="let item of freightTypeOptions"></nz-option>
|
||||
</nz-select>
|
||||
</ng-template>
|
||||
</ng-template>
|
||||
</sf>
|
||||
<nz-divider style="margin-top: 0"></nz-divider>
|
||||
<div>
|
||||
<p style="font-size: 16px">
|
||||
<span style="font-weight: bolder"
|
||||
>总运费：<span style="color: #dc112a">{{ data.totalFreight | currency }}</span></span
|
||||
>总运费：<span style="color: #dc112a">{{ data.totalFreight |currency }}</span></span
|
||||
>
|
||||
</p>
|
||||
<p style="margin-bottom: 0"> 运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency }}</p>
|
||||
<p style="margin-bottom: 0"> 运输费：{{ data.freight |currency }}，附加费：{{ data.surcharge |currency}}</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button nz-button type="button" (click)="close()">关闭</button>
|
||||
|
||||
@ -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.
|
||||
*/
|
||||
@ -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,
|
||||
@ -209,9 +203,10 @@ export class UpdateFreightComponent implements OnInit {
|
||||
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);
|
||||
}
|
||||
});
|
||||
|
||||
@ -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 16:39:11
|
||||
* @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';
|
||||
|
||||
|
||||
// 查询规则抽查列表
|
||||
@ -148,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
|
||||
|
||||
@ -14,7 +14,6 @@
|
||||
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.shipperAppUserName }}</div>
|
||||
<div nz-col nzSpan="10">
|
||||
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'">取消货源</button>
|
||||
<button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'">重新指派</button>
|
||||
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'">修改单价</button>
|
||||
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)">再下一单</button>
|
||||
</div>
|
||||
|
||||
@ -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,
|
||||
// });
|
||||
}
|
||||
|
||||
/**
|
||||
* 查看当前指派
|
||||
*/
|
||||
|
||||
@ -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';
|
||||
|
||||
@ -317,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,
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
@ -331,26 +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();
|
||||
}
|
||||
});
|
||||
}
|
||||
/**
|
||||
* 查询字段个数
|
||||
*/
|
||||
|
||||
@ -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: '<b>确定取消货源吗?</b>',
|
||||
nzContent: `<b>取消后不可恢复，谨慎操作</b>`,
|
||||
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()
|
||||
}
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
@ -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`; // 货主端大宗货源指派熟车
|
||||
// 整车再下一单指派熟车
|
||||
|
||||
Reference in New Issue
Block a user