订单
This commit is contained in:
wangshiming
@ -1,3 +1,11 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-06 19:35:17
|
||||
* @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.html
|
||||
-->
|
||||
<page-header-wrapper [title]="''" [logo]="logo">
|
||||
<ng-template #logo>
|
||||
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
|
||||
@ -10,13 +18,13 @@
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="4">
|
||||
<sv-container class="bdr">
|
||||
<sv label="货源编号" col="1">{{ i?.no }}</sv>
|
||||
<sv label="订单号" col="1">{{ i?.no }}</sv>
|
||||
<sv-title class="text-center text-lg">待接单</sv-title>
|
||||
<sv-title>
|
||||
<div class="">
|
||||
<a class="btn-size">修改单价</a>
|
||||
<a class="btn-size m-lg mr-lg">取消货源</a>
|
||||
<a class="btn-size">再下一单</a>
|
||||
<a class="btn-size" (click)="hand()">指派车队长</a>
|
||||
<!-- <a class="btn-size m-lg mr-lg">取消货源</a>
|
||||
<a class="btn-size">再下一单</a> -->
|
||||
</div>
|
||||
</sv-title>
|
||||
</sv-container>
|
||||
@ -30,12 +38,10 @@
|
||||
</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>
|
||||
<sv label="项目名称">{{ i?.owner }}</sv>
|
||||
<sv label="调度员">32943898021309809423</sv>
|
||||
<sv label="承诺付款时间">3321944288191034921</sv>
|
||||
<sv label="服务类型">18112345678</sv>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div nz-row>
|
||||
@ -50,7 +56,7 @@
|
||||
<p>卸货日期：花花世界/13680058545</p>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col nzSpan="6">
|
||||
<div nz-col nzSpan="5">
|
||||
<div class="source-info bdr bdl pl-md">
|
||||
<h3>货物信息</h3>
|
||||
<p>货物名称：广东省深圳市龙岗区怡亚通大厦</p>
|
||||
@ -58,7 +64,14 @@
|
||||
<p>车型/车长：花花世界/13680058545</p>
|
||||
</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>联系人：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col nzSpan="5">
|
||||
<div class="source-info bdr pl-md">
|
||||
<h3>承运信息</h3>
|
||||
<p>司机：广东省深圳市龙岗区怡亚通大厦</p>
|
||||
@ -68,8 +81,10 @@
|
||||
</div>
|
||||
<div class="source-info pl-md">
|
||||
<h3>补充信息</h3>
|
||||
<p>需要回单</p>
|
||||
<p>备注：奥利给/13680058545</p>
|
||||
<p style="color: #1890ff;">协议附件</p>
|
||||
<p style="color: #1890ff;"> 装车附件</p>
|
||||
<p style="color: #1890ff;">卸货附件</p>
|
||||
<p style="color: #1890ff;">回单附件</p>
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
@ -77,6 +92,7 @@
|
||||
<div class="freight-info-box">
|
||||
<h3>运费信息</h3>
|
||||
<div class="text-right">
|
||||
<p><label class="freigth-label">收款人:</label><span>{{400 | currency }}</span></p>
|
||||
<p><label class="freigth-label">预付:</label><span>{{400 | currency }}</span></p>
|
||||
<p><label class="freigth-label">油卡:</label><span>{{400 | currency }}</span></p>
|
||||
<p><label class="freigth-label">到付:</label><span>{{400 | currency }}</span></p>
|
||||
@ -88,15 +104,45 @@
|
||||
<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">{{400 | currency }}</span></h3>
|
||||
<h3 class="text-right">未支付</h3>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<nz-divider></nz-divider>
|
||||
<div style="display: flex; justify-content: space-evenly;">
|
||||
<div>
|
||||
<div>
|
||||
<span class="leftPadding">司机运输费</span>
|
||||
<span class="leftPadding">1000.00</span>
|
||||
<span class="leftPadding">未支付</span>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div>
|
||||
<span class="leftPadding">司机运输费</span>
|
||||
<span class="leftPadding">1000.00</span>
|
||||
<span class="leftPadding">未支付</span>
|
||||
</div>
|
||||
<div>
|
||||
<span class="leftPadding">附加费</span>
|
||||
<span class="leftPadding">1000.00</span>
|
||||
<span class="leftPadding">未支付</span>
|
||||
</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 nzTitle="轨迹信息" style="width: 100%;" >
|
||||
<div>
|
||||
<st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
|
||||
</st>
|
||||
</div>
|
||||
<div>
|
||||
<!-- <app-ordermanage-map></app-ordermanage-map> -->
|
||||
<div id="container" style="width: 800px; height: 500px"></div>
|
||||
</div>
|
||||
</nz-card>
|
||||
</div>
|
||||
</nz-card>
|
||||
@ -8,10 +8,6 @@
|
||||
.bdl{
|
||||
border-left: 1px solid #ccc;
|
||||
}
|
||||
.title{
|
||||
font-size: 26;
|
||||
font-weight: bold;
|
||||
}
|
||||
.source-info{
|
||||
p{
|
||||
margin-bottom: .5em;
|
||||
@ -34,4 +30,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
.leftPadding {
|
||||
padding-right: 100px;
|
||||
}
|
||||
}
|
||||
@ -1,8 +1,8 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-03 15:59:54
|
||||
* @LastEditors: your name
|
||||
* @LastEditTime: 2021-12-06 19:36:24
|
||||
* @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
|
||||
*/
|
||||
@ -11,8 +11,12 @@ 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 { SupplyManagementService } from '../../services/order-management.service';
|
||||
|
||||
import { OrderManagementGaodeMapComponent } from '../gaode-map/gaode-map.component';
|
||||
import * as $ from 'jquery';
|
||||
declare var AMapUI: any;
|
||||
declare var AMap: any;
|
||||
@Component({
|
||||
selector: 'app-supply-management-vehicle-detail',
|
||||
templateUrl: './vehicle-detail.component.html',
|
||||
@ -23,15 +27,15 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
|
||||
id = this.route.snapshot.params.id;
|
||||
i: any;
|
||||
logColumns: STColumn[] = [
|
||||
{ title: '内容', index: 'theme' },
|
||||
{ title: '操作人', index: 'operationUserPhone' },
|
||||
{ title: '操作时间', index: ' createTime' },
|
||||
{ title: '时间', index: 'operationUserPhone' },
|
||||
{ title: '地点', index: ' createTime' },
|
||||
];
|
||||
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private msgSrv: NzMessageService,
|
||||
private service: SupplyManagementService,
|
||||
private modalService: NzModalService
|
||||
) {
|
||||
|
||||
}
|
||||
@ -45,9 +49,68 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
|
||||
|
||||
|
||||
|
||||
|
||||
hand() {
|
||||
this.modalService.create({
|
||||
nzTitle: '',
|
||||
nzContent: OrderManagementGaodeMapComponent,
|
||||
nzWidth: 1200
|
||||
});
|
||||
}
|
||||
|
||||
goBack() {
|
||||
window.history.go(-1);
|
||||
}
|
||||
|
||||
// poi选点
|
||||
PoiPicker() {
|
||||
AMapUI.setDomLibrary($);
|
||||
let map = new AMap.Map('container', {
|
||||
zoom: 10
|
||||
});
|
||||
AMapUI.loadUI(['misc/PoiPicker'], function (PoiPicker: any) {
|
||||
let poiPicker = new PoiPicker({
|
||||
// city:'北京',
|
||||
input: 'pickerInput'
|
||||
});
|
||||
//初始化poiPicker
|
||||
(window as any).poiPicker = poiPicker;
|
||||
|
||||
var marker = new AMap.Marker();
|
||||
|
||||
var infoWindow = new AMap.InfoWindow({
|
||||
offset: new AMap.Pixel(0, -20)
|
||||
});
|
||||
console.log('0000')
|
||||
console.log(PoiPicker)
|
||||
//选取了某个POI
|
||||
poiPicker.on('poiPicked', function (poiResult: any) {
|
||||
console.log(1111);
|
||||
console.log(poiResult)
|
||||
// console.log(this.addressInput)
|
||||
// this.addressInput = poiResult.item?.name
|
||||
var source = poiResult.source,
|
||||
poi = poiResult.item,
|
||||
info = {
|
||||
source: source,
|
||||
id: poi.id,
|
||||
name: poi.name,
|
||||
location: poi.location.toString(),
|
||||
address: poi.address
|
||||
};
|
||||
marker.setMap(map);
|
||||
infoWindow.setMap(map);
|
||||
|
||||
marker.setPosition(poi.location);
|
||||
infoWindow.setPosition(poi.location);
|
||||
|
||||
infoWindow.setContent(`POI信息: <pre>${JSON.stringify(info, null, 2)}</pre>`);
|
||||
infoWindow.open(map, marker.getPosition());
|
||||
|
||||
map.setCenter(marker.getPosition());
|
||||
});
|
||||
poiPicker.onCityReady(() => {
|
||||
// poiPicker.suggest('美食');
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user