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

车辆对接

Browse Source
This commit is contained in:
wangshiming
2021-12-24 16:30:58 +08:00
parent 4011f13d30
commit 86ca0d4549
9 changed files with 211 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -186,10 +186,10 @@
<!-- <nz-form-item>
<nz-form-label [nzSpan]="4" nzRequired>装货时间</nz-form-label>
<nz-form-control [nzErrorTip]="'请输入装货时间'">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="loadingTime" [(ngModel)]="loadingTime"></nz-date-picker>
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" formControlName="loadTime" [(ngModel)]="loadTime"></nz-date-picker>
</nz-form-control>
</nz-form-item> -->
<p class="time-info">计划装货时间：{{i?.goodsResource?.[0]?.loadingTime}}</p>
<p class="time-info">计划装货时间：{{i?.goodsResource?.[0]?.loadTime}}</p>
</div>
<div nz-col [nzSpan]="8">
<!-- <nz-form-item>
@ -284,11 +284,11 @@
{{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
</ng-template>
<ng-template sf-template="loadingTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="loadingTime"></nz-date-picker>
<ng-template sf-template="loadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="loadTime"></nz-date-picker>
</ng-template>
<ng-template sf-template="unloadingTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadingTime"></nz-date-picker>
<ng-template sf-template="unloadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadTime"></nz-date-picker>
</ng-template>
</sf>
@ -299,7 +299,7 @@
<nz-card nzTitle="运费信息" id="distannce3">
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<st #st [data]="dirvingMessage" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="price" let-item let-index="index">
<input nz-input [ngModel]="item?.price" (ngModelChange)="st.setRow(index, { name: $event })" />
</ng-template>

53
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-24 15:35:18
* @LastEditTime: 2021-12-24 16:27:03
* @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\order-management\components\vehicle-detail\vehicle-detail.component.ts
@ -43,13 +43,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
totalTime = 0.0; //路程总时间
startInfo: any = []; // 装货信息
endInfo: any = []; // 卸货信息
unloadingTime: any; // 货源单设置回显
loadingTime: any; // 货源单设置回显
unloadTime: any; // 货源单设置回显
loadTime: any; // 货源单设置回显
sf3data: any; // 货源单设置回显
sf4data: any; // 货源单设置回显
dirverPhone: any; // 货源单设置回显
dirverBankCard: any; // 货源单设置回显
listImagUrls: any[] = []; // 货源单设置回显
dirvingMessage = [];
imges: any;
previewImage1 = '';
previewVisible1 = false;
@ -76,8 +77,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
private envSrv: EAEnvironmentService,
) {
this.validateForm1 = fb.group({
loadingTime: [null, []],
unloadingTime: [null, []],
loadTime: [null, []],
unloadTime: [null, []],
});
}
@ -299,7 +300,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
})
});
this.listImagUrls = arr;
this.sf4data = res?.goodsInfoList?.[0]
// 对装卸货信息进行初始化
res?.unLoadingPlaceList.forEach((element: any) => {
if(element.type === 1 || element.type === '1') {
@ -388,8 +389,10 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
};
}
// 发车时间到车时间初始化
this.loadingTime = res.loadingTime
this.loadingTime = res.unloadTime
this.loadTime = res.loadTime
this.unloadTime = res.unloadTime
this.dirvingMessage = res.billExpenseDetails;
}
})
}
@ -411,17 +414,17 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
}
})
}
if(typeof(this.unloadingTime) !== 'string' ){
var c = new Date(this.unloadingTime);
this.unloadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
if(typeof(this.unloadTime) !== 'string' ){
var c = new Date(this.unloadTime);
this.unloadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
}
if(typeof(this.loadingTime) !== 'string' ) {
var c = new Date(this.loadingTime);
this.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
if(typeof(this.loadTime) !== 'string' ) {
var c = new Date(this.loadTime);
this.loadTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
}
console.log(this.sf3.value)
console.log(this.sf4.value)
console.log(this.sf.value)
console.log('dirvingMessage=>>>>>>'+ this.dirvingMessage)
console.log( this.dirvingMessage)
console.log( this.st)
const params = {
id: this.id,
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,],
@ -432,14 +435,14 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
...this.sf4.value
}],
// 运费信息
billExpenseDetailDTOList: this.i?.billExpenseDetails,
billExpenseDetailDTOList: this.dirvingMessage,
// 收款人
payeeId: this.dirverPhone,
dirverBankCard: this.dirverBankCard, // 银行卡
// 发车时间
loadPlanTime: this.loadingTime,
loadTime: this.loadTime,
// 到车时间
unloadPlanTime: this.loadingTime,
unloadTime: this.unloadTime,
loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath : this.sf.value?.loadingLadingBillFilePath?.url,
loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url,
@ -689,7 +692,7 @@ initSF4() {
placeholder: '请输入'
}
},
loadingTime: {
loadTime: {
type: 'string',
title: '发车时间',
ui: {
@ -697,7 +700,7 @@ initSF4() {
placeholder: '请输入'
}
},
unloadingTime: {
unloadTime: {
type: 'string',
title: '到车时间',
ui: {
@ -707,7 +710,7 @@ initSF4() {
},
},
required: ['weight','loadingTime','unloadingTime']
required: ['weight','loadTime','unloadTime']
};
this.ui4 = {
'*': {
@ -732,10 +735,10 @@ initSF4() {
$drivers: {
grid: { span: 12 }
},
$loadingTime: {
$loadTime: {
grid: { span: 12 }
},
$unloadingTime: {
$unloadTime: {
grid: { span: 12 }
},
};

10
src/app/routes/sys-setting/components/crm-management/crm-management.component.html
View File

@ -1,4 +1,12 @@
<page-header-wrapper title="角色管理">
<!--
* @Author: your name
* @Date: 2021-12-24 15:38:08
* @LastEditTime: 2021-12-24 15:53:02
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\sys-setting\components\crm-management\crm-management.component.html
-->
<page-header-wrapper title="CRM客户管理">
</page-header-wrapper>
<nz-card class="search-box">

37
src/app/routes/sys-setting/components/network-freight/network-freight.component.html Normal file
View File

@ -0,0 +1,37 @@
<!--
* @Author: your name
* @Date: 2021-12-24 15:38:08
* @LastEditTime: 2021-12-24 15:58:48
* @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\sys-setting\components\crm-management\crm-management.component.html
-->
<page-header-wrapper title="网络货运人">
</page-header-wrapper>
<nz-card class="search-box">
<div nz-row nzGutter="8">
<div nz-col [nzSpan]="6">
<sf #sf [schema]="searchSchema" [ui]="{ '*': { spanLabelFixed: 90,grid: { span: 24 } }}" [compact]="true"
[button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="8" nzOffset="1">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button (click)="resetSF()">重置</button>
</div>
</div>
</nz-card>
<nz-card class="content-box">
<div class="d-flex justify-content-end mb-sm">
<div>
<button nz-button nzType="primary" (click)="roleAction()" >新建角色</button>
</div>
</div>
<st #st [data]="url" [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" [scroll]="{ y: '370px' }" (change)="stChange($event)"></st>
</nz-card>

13
src/app/routes/sys-setting/components/network-freight/network-freight.component.less Normal file
View File

@ -0,0 +1,13 @@
:host::ng-deep{
.search-box{
.ant-card-body{
padding-bottom: 18px;
}
}
.content-box{
.ant-card-body{
padding-top: 14px;
}
}
}

100
src/app/routes/sys-setting/components/network-freight/network-freight.component.ts Normal file
View File

@ -0,0 +1,100 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { STComponent, STColumn, STChange } from '@delon/abc/st';
import { SFComponent, SFSchema } from '@delon/form';
import { NzModalService } from 'ng-zorro-antd/modal';
import { SystemService } from '../../services/system.service';
@Component({
selector: 'app-network-freight-component',
templateUrl: './network-freight.component.html',
styleUrls: ['./network-freight.component.less']
})
export class NetworkFreightComponent implements OnInit {
@ViewChild('st', { static: true })
st!: STComponent;
@ViewChild('sf', { static: false })
sf!: SFComponent;
url = `/rule?_allow_anonymous=true`;
searchSchema: SFSchema = {
properties: {
receiveName: {
type: 'string',
title: '角色名称',
ui: { placeholder: '请输入' }
}
}
};
columns: STColumn[] = [
{ title: '角色名称', index: 'no' },
{ title: '角色描述', index: 'description' },
{ title: '创建人手机号', index: 'description' },
{
title: '创建时间',
index: 'updatedAt',
type: 'date'
},
{
title: '操作',
buttons: [
{
text: '编辑',
click: item => this.roleAction(item)
},
{
text: '删除',
click: item => this.deleteAction(item)
}
]
}
];
selectedRows: any[] = [];
reqParams = { pageIndex: 1, pageSize: 10 };
constructor(public service: SystemService, private nzModalService: NzModalService) {}
ngOnInit(): void {}
stChange(e: STChange): void {
switch (e.type) {
case 'checkbox':
this.selectedRows = e.checkbox!;
break;
case 'filter':
this.st.load();
break;
}
}
roleAction(item?: any) {
const modal = this.nzModalService.create({
// nzContent: SettingRoleEditComponent,
nzWidth: 900,
nzComponentParams: item ? { i: { ...item } } : { i: { id: 0 } },
nzFooter: null
});
modal.afterClose.subscribe(res => {
this.st.load();
});
}
deleteAction(item?: any) {
this.nzModalService.error({
nzTitle: '确认删除？',
nzClosable: false,
nzCancelText: '取消',
nzOnOk: () => {}
});
}
/**
* 重置表单
*/
resetSF() {
this.sf.reset();
}
}

10
src/app/routes/sys-setting/sys-setting-routing.module.ts
View File

@ -1,3 +1,11 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:23:05
* @LastEditTime: 2021-12-24 15:57:37
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\sys-setting\sys-setting-routing.module.ts
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { AgreementConfigComponentsBaseComponent } from './components/agreement-config/agreement-config.component';
@ -7,6 +15,7 @@ import { BasicSettingComponent } from './components/basic-setting/basic-setting.
import { CartConfigComponent } from './components/cart-config/cart-config.component';
import { CrmManagementComponent } from './components/crm-management/crm-management.component';
import { GoodsNameConfigComponent } from './components/goods-name-config/goods-name-config.component';
import { NetworkFreightComponent } from './components/network-freight/network-freight.component';
import { RoleManagementComponent } from './components/role-management/role-management.component';
import { StaffManagementComponent } from './components/staff-management/staff-management.component';
import { SystemConfigComponent } from './components/system-config/system-config.component';
@ -28,6 +37,7 @@ const routes: Routes = [
{ path: 'system-config', component: SystemConfigComponent },
{ path: 'goods-name-config', component: GoodsNameConfigComponent },
{ path: 'crm-management', component: CrmManagementComponent },
{ path: 'network-freight', component: NetworkFreightComponent },
];
@NgModule({

4
src/app/routes/sys-setting/sys-setting.module.ts
View File

@ -22,6 +22,7 @@ import { SettingRoleEditComponent } from './components/role-management/edit/edit
import { SettingMenuComponent } from './components/role-management/menu/menu.component';
import { GoodsNameConfigComponent } from './components/goods-name-config/goods-name-config.component';
import { CrmManagementComponent } from './components/crm-management/crm-management.component';
import { NetworkFreightComponent } from './components/network-freight/network-freight.component';
const COMPONENTS = [
StaffManagementComponent,
@ -36,7 +37,8 @@ const COMPONENTS = [
BasicSettingComponent,
SystemConfigComponent,
GoodsNameConfigComponent,
CrmManagementComponent
CrmManagementComponent,
NetworkFreightComponent
];
const NOTROUTECOMPONENTS = [
BuyerTranspowerComponent,

4
src/assets/mocks/menu-data.json
View File

@ -384,6 +384,10 @@
"text": "CRM客户管理",
"link": "/system/crm-management"
},
{
"text": "网络货运人",
"link": "/system/network-freight"
},
{
"text": "角色管理",
"link": "/system/role-management"