Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

初步联调货源

Browse Source
This commit is contained in:
wangshiming
2021-12-08 16:32:15 +08:00
parent a6b9c6b07f
commit 1d395b3a8a
8 changed files with 168 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
View File

@ -6,17 +6,20 @@
</ng-template>
</page-header-wrapper>
<nz-card>
<nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
<div nz-row>
<div nz-col nzSpan="4">
<div nz-col nzSpan="6">
<sv-container class="bdr">
<sv label="货源编号" col="1">{{ i?.no }}</sv>
<sv-title class="text-center text-lg">待接单</sv-title>
<sv label="货源编号" col="1">{{ dataList?.resourceCode }}</sv>
<sv-title class="text-center text-lg">
<span *ngIf="dataList?.resourceType === 1">待接单</span>
<span *ngIf="dataList?.resourceType === 2">已接单</span>
<span *ngIf="dataList?.resourceType === 3">已取消</span>
</sv-title>
<sv-title>
<div class="">
<a class="btn-size">修改单价</a>
<a class="btn-size" (click)="modification()">修改单价</a>
<a class="btn-size m-lg mr-lg">取消货源</a>
<a class="btn-size">再下一单</a>
<a class="btn-size" (click)="nextOrder()">再下一单</a>
</div>
</sv-title>
</sv-container>
@ -24,78 +27,96 @@
<div nz-col nzSpan="16" class="approval-status">
<nz-steps style="width: 80%; margin: 0 auto" [nzLabelPlacement]="'vertical'">
<nz-step nzStatus="finish" nzIcon="user" [nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
<nz-step nzStatus="finish" nzIcon="solution" nzTitle="完结"></nz-step>
<nz-step nzStatus="finish" nzIcon="user" nzTitle="完结"></nz-step>
</nz-steps>
</div>
</div>
<nz-divider></nz-divider>
<div sv-container *ngIf="i">
<sv label="项目名称">{{ i?.owner }}</sv>
<sv label="截止时间">32943898021309809423</sv>
<sv label="服务类型">3321944288191034921</sv>
<sv label="录单员">18112345678</sv>
<sv label="调度员">曲丽丽 18100000000 </sv>
<sv label="承诺付款时间">曲丽丽 18100000000 </sv>
<div sv-container >
<sv label="项目名称">{{ dataList?.enterpriseProjectId }}</sv>
<sv label="外部货源号">{{ dataList?.externalResourceCode }}</sv>
<sv label="录单员">{{ dataList?.enterpriseProjectId }}</sv>
<sv label="调度员">{{ dataList?.dispatchName }}</sv>
</div>
<nz-divider></nz-divider>
<div nz-row>
<div nz-col nzSpan="6">
<div class="source-info">
<h3>装卸货信息</h3>
<p>装货地：广东省深圳市龙岗区怡亚通大厦</p>
<p>联系人：奥利给/13680058545</p>
<p>卸货地：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
<p>联系人：花花世界/13680058545</p>
<div *ngFor="let item of dataList?.unLoadingPlaceList; let i = index">
<h3 *ngIf="i === 0" style="font-weight: 700;">装卸货信息</h3>
<div *ngIf="item?.type === 1">
<p>装货地：{{item?.detailedAddress}}</p>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
<p>发货日期：{{item?.createTime}}</p>
</div>
<div *ngIf="item.type === 2">
<p>卸货地：{{item?.detailedAddress}}</p>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
<p>卸货日期：{{item?.modifyTime}}</p>
</div>
</div>
</div>
</div>
<div nz-col nzSpan="6">
<div nz-col nzSpan="5">
<div class="source-info bdr bdl pl-md">
<h3>货物信息</h3>
<p>货物名称：广东省深圳市龙岗区怡亚通大厦</p>
<p>运费单价：奥利给/13680058545</p>
<p>重量/体积：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
<p>剩余：花花世界/13680058545</p>
<p>车型/车长：花花世界/13680058545</p>
<div *ngFor="let item of dataList?.goodsInfoList; let i = index">
<h3 *ngIf="i === 0" style="font-weight: 700;">货物信息</h3>
<p>货物名称：{{item?.goodsName}}</p>
<p>货物数量：{{item?.weight}}吨/{{item?.volume}}立方</p>
<p>剩余：{{item?.weight}}吨/{{item?.volume}}立方</p>
<p>用车需求：{{item?.vehicleDemand}}</p>
</div>
</div>
</div>
<div nz-col nzSpan="6">
<div nz-col nzSpan="5">
<div class="source-info bdr pl-md">
<h3>关联运单</h3>
<p>待发车(<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)</p>
<p>运输中(<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)</p>
<p>待签收(<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)</p>
<p>已完成(<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)</p>
<p>已取消 (<span [ngClass]="{ 'text-primary': i?.id > 0 }">{{ i?.id }}</span>)</p>
<h3 style="font-weight: 700;">承运信息</h3>
<p>网络货运人：{{dataList?.carrierInformationVO?.enterpriseInfoName}}</p>
<p>服务类型：{{dataList?.carrierInformationVO?.serviceType === 1 ? '抢单' : '指派'}}</p>
<p><a href="javascript:;">当前指派</a></p>
</div>
</div>
<div nz-col nzSpan="5">
<div class="source-info bdr pl-md">
<h3 style="font-weight: 700;">关联运单</h3>
<p>待发车 ({{dataList?.goodsInfoList?.goodsName}})</p>
<p>运输中 ({{dataList?.goodsInfoList?.goodsName}})</p>
<p>待签收 ({{dataList?.goodsInfoList?.goodsName}})</p>
<p>已完成 ({{dataList?.goodsInfoList?.goodsName}})</p>
<p>已取消 ({{dataList?.goodsInfoList?.goodsName}})</p>
</div>
</div>
<div class="source-info pl-md">
<h3>补充信息</h3>
<p>结算重量：广东省深圳市龙岗区怡亚通大厦</p>
<p>备注：奥利给/13680058545</p>
<h3 style="font-weight: 700;">补充信息</h3>
<p>备注：{{dataList?.supplementaryInformationVO?.remarks}}</p>
</div>
</div>
<nz-divider></nz-divider>
<div nz-row>
<nz-card [nzTitle]="cardTitleTemplate" style="width: 100%;" [nzExtra]="extraTemplate">
<st #st1 [data]="i?.auditRecordList" [columns]="driverColums" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
</nz-card>
<div class="freight-info-box">
<h3 style="font-weight: 700;">运费信息</h3>
<div class="text-right">
<p>预付：{{dataList?.expenseList?.prePay | currency: '￥' }}</p>
<p>油卡：{{dataList?.expenseList?.oilCardPay | currency: '￥'}}</p>
<p>到付：{{dataList?.expenseList?.toPay | currency: '￥'}}</p>
<p>回单付：{{dataList?.expenseList?.receiptPay | currency: '￥'}}</p>
<p>保险费：{{dataList?.expenseList?.insuranceFee | currency: '￥'}}</p>
<p>附加费保险费：{{dataList?.expenseList?.appendFee | currency: '￥'}}</p>
</div>
</div>
<nz-divider></nz-divider>
<div class="freight-info-box" nz-row>
<div nz-col nzSpan="24">
<h3 class="text-right"><label>总计 :</label> <span class="text-error-dark text-xl">{{dataList?.expenseList?.totalFee | currency: '￥' }}</span></h3>
</div>
</div>
</div>
<nz-divider></nz-divider>
<div nz-row>
<nz-card nzTitle="操作日志" style="width: 100%;">
<st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
</nz-card>
</div>
</nz-card>
<ng-template #cardTitleTemplate>
<h4>指派熟车
<span class="text-sm">已选择
<a class="text-warning-light"> 10</a>
位司机
</span>
</h4>
</ng-template>
<ng-template #extraTemplate>
<button nzType="primary" (click)="assignedCar()" nz-button>指派熟车</button>
</ng-template>
</nz-card>

38
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -1,13 +1,13 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-07 19:51:21
* @LastEditors: your name
* @LastEditTime: 2021-12-08 16:20:45
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\bulk-detail\bulk-detail.component.ts
*/
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
@ -48,22 +48,30 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
],
},
];
dataList: any;
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
private service: SupplyManagementService,
private modal: NzModalService
private modal: NzModalService,
private router: Router,private ar: ActivatedRoute
) {
}
ngOnInit(): void {
this.service.http.get(`/user/${this.id}?_allow_anonymous=true&_allow_badcode=true`).subscribe(res => {
console.log(res);
this.i = res
});
this.getDetailList();
}
// 获取录单员
getDetailList() {
const params = {
id: this.id
};
this.service.request(`${this.service.$api_get_getBulkDetail}`, params).subscribe((res) => {
console.log(res)
this.dataList = res
})
}
/**
* 移除司机
*/
@ -103,4 +111,16 @@ export class SupplyManagementBulkDetailComponent implements OnInit {
goBack() {
window.history.go(-1);
}
// 修改货源
modification() {
this.router.navigate(['/supply-management/vehicle-amend', this.id], {
relativeTo: this.ar
})
}
// 再下一单
nextOrder() {
this.router.navigate(['/supply-management/vehicle-amend', this.id], {
relativeTo: this.ar
})
}
}

10
src/app/routes/supply-management/components/bulk/bulk.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-03 14:52:01
* @LastEditTime: 2021-12-08 16:06:57
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\bulk\bulk.component.html
@ -62,8 +62,12 @@
[loadingDelay]="500"
[loading]="service.http.loading"
>
<ng-template st-row="goodsId" let-item let-index="index">
<a [routerLink]="'/supply-management/bulk-detail/'+item.id">{{item.no}}</a>
<ng-template st-row="resourceCode" let-item let-index="index">
<a [routerLink]="'/supply-management/bulk-detail/'+item.id">{{item?.resourceCode}}</a>
</ng-template>
<ng-template st-row="serviceType" let-item let-index="index">
<div *ngIf="item.serviceType === 1">抢单</div>
<div *ngIf="item.serviceType === 2">指派</div>
</ng-template>
<ng-template st-row="orderSn" let-item let-index="index">
<div>待发车 (<span [ngStyle]="{ color:index>0?'#1890FF':''}">0</span>)</div>

88
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -13,7 +13,7 @@ import { SupplyManagementUpdatePriceComponent } from '../update-price/update-pri
templateUrl: './bulk.component.html',
})
export class SupplyManagementBulkComponent implements OnInit {
url = `/user?_allow_anonymous=true`;
resourceStatus: any;
ui: SFUISchema = {};
ui2: SFUISchema = {};
schema: SFSchema = {};
@ -27,22 +27,22 @@ export class SupplyManagementBulkComponent implements OnInit {
@ViewChild('sfFre', { static: false }) sfFre!: SFComponent;
tabs = [ {
name: '全部',
type: 5,
type: 0,
count: 0,
},
{
name: '待接单',
type: 5,
name: '进行中',
type: 1,
count: 0,
},
{
name: '已接单',
type: 5,
name: '已完结',
type: 2,
count: 0,
},
{
name: '已取消',
type: 5,
type: 3,
count: 0,
},
];
@ -57,7 +57,14 @@ export class SupplyManagementBulkComponent implements OnInit {
* 查询参数
*/
get reqParams() {
console.log(this.resourceStatus)
const a:any = {};
if(this.resourceStatus) {
a.resourceStatus = this.resourceStatus
}
console.log(a)
return {
...a,
...this.sf?.value,
};
}
@ -68,27 +75,25 @@ export class SupplyManagementBulkComponent implements OnInit {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
no: {
resourceCode: {
type: 'string',
title: '货源编号'
},
no2: {
loadingAddressArr: {
type: 'string',
title: '装货地'
},
no1: {
unloadingAddressArr: {
type: 'string',
title: '卸货地'
},
sex2: {
serviceType: {
title: '服务类型',
type: 'string',
default: 0,
enum: [
{ label: '未知', value: 0 },
{ label: '男', value: 1 },
{ label: '女', value: 2 },
{ label: '保密', value: 3 },
{ label: '抢单', value: 1 },
{ label: '指派', value: 2 },
],
ui: {
widget: 'select',
@ -97,7 +102,7 @@ export class SupplyManagementBulkComponent implements OnInit {
},
} as SFSelectWidgetSchema,
},
sex: {
settlementBasis: {
title: '结算依据',
type: 'string',
default: 0,
@ -114,7 +119,7 @@ export class SupplyManagementBulkComponent implements OnInit {
},
} as SFSelectWidgetSchema,
},
createTime: {
releaseTime: {
title: '发布时间',
type: 'string',
ui: {
@ -126,7 +131,7 @@ export class SupplyManagementBulkComponent implements OnInit {
},
} as SFDateWidgetSchema,
},
createTime2: {
deadlineTime: {
title: '截止时间',
type: 'string',
ui: {
@ -138,7 +143,7 @@ export class SupplyManagementBulkComponent implements OnInit {
},
} as SFDateWidgetSchema,
},
appId: {
enterpriseInfoName: {
type: 'string',
title: '网络货运人',
ui: {
@ -168,7 +173,7 @@ export class SupplyManagementBulkComponent implements OnInit {
initSFFre() {
this.freightSchema = {
properties: {
roleDescription: {
remarks: {
title: '备注',
type: 'string',
maxLength: 50,
@ -191,68 +196,76 @@ export class SupplyManagementBulkComponent implements OnInit {
title: '货源编号',
width: '100px',
className: 'text-center',
render: 'goodsId'
render: 'resourceCode'
},
{ title: '服务类型', index: 'linkUrl', width: '120px', className: 'text-center' },
{ title: '货主', index: 'linkUrl', width: '120px', className: 'text-center' },
{ title: '项目名称', index: 'linkUrl', width: '120px', className: 'text-center' },
{ title: '服务类型', render: 'serviceType', width: '120px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserNmae', width: '120px', className: 'text-center' },
{ title: '项目名称', index: 'enterpriseProjectName', width: '120px', className: 'text-center' },
{ title: '关联订单', render: 'orderSn', width: '120px', className: 'text-center' },
{ title: '货物信息', render: 'goodsInfo', width: '180px', className: 'text-center' },
{ title: '货物信息', render: 'goodsInfos', width: '180px', className: 'text-center' },
{
title: '装货地',
className: 'text-center',
index: 'loadingAddressArr',
width: '120px',
}, {
title: '卸货地',
className: 'text-center',
index: 'unloadingAddressArr',
width: '120px',
},
{
title: '用车需求',
className: 'text-center',
width: '150px',
render: 'demand'
index: 'vehicleDemand'
},
{
title: '运费单价',
className: 'text-center',
width: '150px',
index: 'freightPrice',
},
{
title: '结算依据',
className: 'text-center',
width: '120px',
index: 'settlementBasis',
},
{
title: '货源状态',
className: 'text-center',
index: 'enStatusStr2',
index: 'resourceStatus',
type: 'badge',
width: '120px',
badge: {
正常: { text: '正常', color: 'success' },
冻结: { text: '冻结', color: 'warning' },
废弃: { text: '废弃', color: 'default' },
1: { text: '待接单', color: 'success' },
2: { text: '已接单', color: 'warning' },
},
},
{
title: '截止时间',
width: '170px',
className: 'text-center',
index: 'deadlineTime',
},
{
title: '发布时间',
width: '170px',
className: 'text-center',
index: 'releaseTime',
},
{
title: '审核状态',
className: 'text-center',
index: 'enStatusStr3',
index: 'auditStatus',
type: 'badge',
width: '170px',
badge: {
正常: { text: '正常', color: 'success' },
冻结: { text: '冻结', color: 'warning' },
废弃: { text: '废弃', color: 'default' },
1: { text: '待审核', color: 'warning' },
2: { text: '审核通过', color: 'success' },
3: { text: '不通过', color: 'default' },
4: { text: '已取消', color: 'default' },
},
},
{
@ -332,7 +345,12 @@ export class SupplyManagementBulkComponent implements OnInit {
}
selectChange(e: number) {
console.log(e);
this.resourceStatus = e;
this.initST();
setTimeout(() => {
this.st.load();
}, 500);
}
/**

4
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -91,7 +91,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
initSF1() {
this.schema1 = {
properties: {
shipperAdispatchNameppUserNmae: {
shipperAppUserNmae: {
type: 'string',
title: '货主',
maxLength: 30,
@ -137,7 +137,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请输入'
}
},
dispatchName: {
dispatchName2: {
type: 'string',
title: '调度员',
enum: [

5
src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -47,14 +47,15 @@
<div *ngIf="item?.type === 1">
<p>装货地：{{item?.detailedAddress}}</p>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
<p>发货日期：{{item?.createTime}}</p>
</div>
<div *ngIf="item.type === 2">
<p>卸货地：{{item?.detailedAddress}}</p>
<p>联系人：{{item?.appUserName}}/{{item?.contractTelephone}}</p>
</div>
<p>发货日期：{{item?.createTime}}</p>
<p>卸货日期：{{item?.modifyTime}}</p>
</div>
</div>
</div>
</div>
<div nz-col nzSpan="5">

1
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -214,7 +214,6 @@ export class SupplyManagementVehicleComponent implements OnInit {
index: 'loadingAddressArr',
className: 'text-center',
width: '120px',
render: 'loadingAddressArr'
}, {
title: '卸货地',
index: 'unloadingAddressArr',

2
src/app/routes/supply-management/services/supply-management.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-07 20:09:14
* @LastEditTime: 2021-12-08 16:17:36
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\services\supply-management.service.ts