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,148 @@
|
||||
<!--
|
||||
* @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()">
|
||||
<i nz-icon nzType="left" nzTheme="outline"></i>
|
||||
</button>
|
||||
</ng-template>
|
||||
</page-header-wrapper>
|
||||
<nz-card>
|
||||
<nz-spin *ngIf="!i" class="modal-spin"></nz-spin>
|
||||
<div nz-row>
|
||||
<div nz-col nzSpan="4">
|
||||
<sv-container class="bdr">
|
||||
<sv label="订单号" col="1">{{ i?.no }}</sv>
|
||||
<sv-title class="text-center text-lg">待接单</sv-title>
|
||||
<sv-title>
|
||||
<div class="">
|
||||
<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>
|
||||
</div>
|
||||
<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-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>
|
||||
</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>
|
||||
<p>发货日期：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
|
||||
<p>卸货日期：花花世界/13680058545</p>
|
||||
</div>
|
||||
</div>
|
||||
<div nz-col nzSpan="5">
|
||||
<div class="source-info bdr bdl pl-md">
|
||||
<h3>货物信息</h3>
|
||||
<p>货物名称：广东省深圳市龙岗区怡亚通大厦</p>
|
||||
<p>重量/体积：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
|
||||
<p>车型/车长：花花世界/13680058545</p>
|
||||
</div>
|
||||
</div>
|
||||
<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>
|
||||
<p>车牌号：广东省深圳市福田区岗厦村9巷8号405（新村）</p>
|
||||
<p>车型/车长/承重：{{'拖车'}} | {{'4.5米'}} | {{'15吨'}}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="source-info pl-md">
|
||||
<h3>补充信息</h3>
|
||||
<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>
|
||||
<div nz-row>
|
||||
<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>
|
||||
<p><label class="freigth-label">回单付:</label><span>{{400 | currency}}</span></p>
|
||||
<p><label class="freigth-label">附加费:</label><span>{{400 | currency }}</span></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">{{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%;" >
|
||||
<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>
|
||||
@ -0,0 +1,36 @@
|
||||
: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;
|
||||
}
|
||||
}
|
||||
}
|
||||
.leftPadding {
|
||||
padding-right: 100px;
|
||||
}
|
||||
}
|
||||
@ -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,116 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-06 20:21:29
|
||||
* @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
|
||||
*/
|
||||
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 { 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-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;
|
||||
logColumns: STColumn[] = [
|
||||
{ title: '时间', index: 'operationUserPhone' },
|
||||
{ title: '地点', index: ' createTime' },
|
||||
];
|
||||
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private msgSrv: NzMessageService,
|
||||
private service: SupplyManagementService,
|
||||
private modalService: NzModalService
|
||||
) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit(): void {
|
||||
this.service.http.get(`/user/${this.id}?_allow_anonymous=true&_allow_badcode=true`).subscribe(res => {
|
||||
console.log(res);
|
||||
this.i = res
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
|
||||
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('美食');
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,147 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 11:10:14
|
||||
* @LastEditTime: 2021-12-06 20:22:49
|
||||
* @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\vehicle\vehicle.component.html
|
||||
-->
|
||||
<!-- 搜索表单 -->
|
||||
<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" [disabled]="!sf.valid" [nzLoading]="service.http.loading"
|
||||
(click)="st?.load(1)">查询</button>
|
||||
<button nz-button nzType="primary"
|
||||
>导出</button>
|
||||
<button nz-button (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)" >
|
||||
<nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
<div style="margin-top: 15px;">
|
||||
<!-- [req]="{ method: 'GET', 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] }"
|
||||
[loadingDelay]="500" [loading]="service.http.loading" -->
|
||||
<st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
|
||||
<ng-template st-row="goodsId" let-item let-index="index">
|
||||
<a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.no}}</a>
|
||||
</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 st-row="feiong" let-item let-index="index">
|
||||
<div style="color: aqua;" (click)="OpenPrice()">
|
||||
{{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
|
||||
multiSort
|
||||
size="small"
|
||||
[bordered]="true"
|
||||
[data]="datass"
|
||||
[columns]="columnsFloat"
|
||||
[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] }"
|
||||
[loadingDelay]="500"
|
||||
>
|
||||
</st>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooter>
|
||||
<button nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
|
||||
<button nz-button nzType="default" (click)="handleOK()">确定</button>
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
|
||||
<ng-container *nzModalContent>
|
||||
<st
|
||||
#stFloatView
|
||||
multiSort
|
||||
size="small"
|
||||
[bordered]="true"
|
||||
[data]="datass"
|
||||
[columns]="columnsFloatView"
|
||||
[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] }"
|
||||
[loadingDelay]="500"
|
||||
>
|
||||
</st>
|
||||
<div><span>变更原因：</span></div>
|
||||
<div><span>拒绝原因：</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)="handleOK()">确定</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>
|
||||
@ -0,0 +1,2 @@
|
||||
:host {
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-06 20:03:28
|
||||
* @LastEditTime: 2021-12-06 20:03:29
|
||||
* @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\bulk\bulk.component.spec.ts
|
||||
*/
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-06 19:39:49
|
||||
* @LastEditTime: 2021-12-06 19:41:08
|
||||
* @LastEditors: your name
|
||||
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
|
||||
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\bulk\bulk.component.spec.ts
|
||||
*/
|
||||
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,477 @@
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STColumn, STComponent } from '@delon/abc/st';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { map } from 'rxjs/operators';
|
||||
import { SupplyManagementService } from '../../services/order-management.service';
|
||||
|
||||
|
||||
@Component({
|
||||
selector: 'app-supply-management-bulk',
|
||||
templateUrl: './bulk.component.html',
|
||||
styleUrls: ['./bulk.component.less']
|
||||
})
|
||||
export class OrderManagementBulkComponent implements OnInit {
|
||||
url = `/user?_allow_anonymous=true`;
|
||||
ui: SFUISchema = {};
|
||||
schema: SFSchema = {};
|
||||
auditMany = false;
|
||||
isVisibleView = false;
|
||||
isVisibleEvaluate = false;
|
||||
isVisible = false;
|
||||
_$expand = false;
|
||||
@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;
|
||||
columns: STColumn[] = [];
|
||||
columnsFloat: STColumn[] = [];
|
||||
columnsFloatView: STColumn[] = [];
|
||||
datass: any = [
|
||||
{
|
||||
one: '1',
|
||||
two: '1',
|
||||
three: '1',
|
||||
id: 1
|
||||
},
|
||||
{
|
||||
one: '2',
|
||||
two: '2',
|
||||
three: '2',
|
||||
id: 2
|
||||
},
|
||||
];
|
||||
tabs = [ {
|
||||
name: '全部',
|
||||
type: 5,
|
||||
count: 0,
|
||||
},
|
||||
{
|
||||
name: '待发车',
|
||||
type: 5,
|
||||
count: 0,
|
||||
},
|
||||
{
|
||||
name: '运输中',
|
||||
type: 5,
|
||||
count: 0,
|
||||
},
|
||||
{
|
||||
name: '代签收',
|
||||
type: 5,
|
||||
count: 0,
|
||||
},
|
||||
{
|
||||
name: '已完成',
|
||||
type: 5,
|
||||
count: 0,
|
||||
},
|
||||
{
|
||||
name: '已取消',
|
||||
type: 5,
|
||||
count: 0,
|
||||
},
|
||||
];
|
||||
constructor(public service: SupplyManagementService, private modal: NzModalService) { }
|
||||
|
||||
/**
|
||||
* 查询参数
|
||||
*/
|
||||
get reqParams() {
|
||||
return {
|
||||
...this.sf?.value,
|
||||
};
|
||||
}
|
||||
get selectedRows() {
|
||||
return this.st?.list.filter((item) => item.checked) || [];
|
||||
}
|
||||
ngOnInit(): void {
|
||||
this.initSF();
|
||||
this.initST();
|
||||
this.initSTFloat();
|
||||
this.initSTFloatView();
|
||||
}
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 初始化查询表单
|
||||
*/
|
||||
initSF() {
|
||||
this.schema = {
|
||||
properties: {
|
||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||
no: {
|
||||
type: 'string',
|
||||
title: '运单号',
|
||||
},
|
||||
no2: {
|
||||
type: 'string',
|
||||
title: '货源编号'
|
||||
},
|
||||
no1: {
|
||||
type: 'string',
|
||||
title: '托运公司'
|
||||
},
|
||||
no3: {
|
||||
type: 'string',
|
||||
title: '装货地',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
},
|
||||
no4: {
|
||||
type: 'string',
|
||||
title: '卸货地',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
},
|
||||
no7: {
|
||||
type: 'string',
|
||||
title: '承运司机',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
},
|
||||
no9: {
|
||||
type: 'string',
|
||||
title: '车牌号',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
},
|
||||
no10: {
|
||||
type: 'string',
|
||||
title: '收款人',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
},
|
||||
sex: {
|
||||
title: '支付状态',
|
||||
type: 'string',
|
||||
default: 0,
|
||||
enum: [
|
||||
{ label: '未知', value: 0 },
|
||||
{ label: '男', value: 1 },
|
||||
{ label: '女', value: 2 },
|
||||
{ label: '保密', value: 3 },
|
||||
],
|
||||
ui: {
|
||||
widget: 'select',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
createTime: {
|
||||
title: '创建时间',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'date',
|
||||
mode: 'range',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFDateWidgetSchema,
|
||||
},
|
||||
appId: {
|
||||
type: 'string',
|
||||
title: '是否风险单',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
allowClear: true,
|
||||
asyncData: () => this.getCatalogueMember(),
|
||||
},
|
||||
},
|
||||
},
|
||||
type: 'object',
|
||||
};
|
||||
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化数据列表
|
||||
*/
|
||||
initST() {
|
||||
this.columns = [
|
||||
{ title: '', type: 'checkbox', width: '50px', className: 'text-center' },
|
||||
{
|
||||
title: '运单号',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
render: 'goodsId'
|
||||
},
|
||||
{
|
||||
title: '货源编号',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
},
|
||||
{ title: '托运公司', index: 'externalSn', width: '120px', className: 'text-center' },
|
||||
{ title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' },
|
||||
{
|
||||
title: '卸货地',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '货物名称',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '承运司机',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '车牌号',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '运费单价',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '接单重量',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '运费变更记录',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
render: 'feiong'
|
||||
},
|
||||
{
|
||||
title: '结算重量',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '成交金额',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
render: 'enStatusStr27878'
|
||||
},
|
||||
{
|
||||
title: '收款人',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
|
||||
},
|
||||
{
|
||||
title: '支付状态',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '创建时间',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr3',
|
||||
type: 'badge',
|
||||
width: '100px',
|
||||
badge: {
|
||||
正常: { text: '正常', color: 'success' },
|
||||
冻结: { text: '冻结', color: 'warning' },
|
||||
废弃: { text: '废弃', color: 'default' },
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '异常原因',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr3',
|
||||
width: '100px',
|
||||
},
|
||||
{
|
||||
title: '运单状态',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr3',
|
||||
type: 'badge',
|
||||
width: '100px',
|
||||
badge: {
|
||||
正常: { text: '正常', color: 'success' },
|
||||
冻结: { text: '冻结', color: 'warning' },
|
||||
废弃: { text: '废弃', color: 'default' },
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
width: '200px',
|
||||
className: 'text-left',
|
||||
buttons: [
|
||||
{
|
||||
text: '查看评价',
|
||||
click: (_record) => this.viewEvaluate(_record),
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
}
|
||||
initSTFloat() {
|
||||
this.columnsFloat = [
|
||||
{
|
||||
title: '序号',
|
||||
className: 'text-center',
|
||||
index: 'one',
|
||||
},
|
||||
{
|
||||
title: '操作时间',
|
||||
className: 'text-center',
|
||||
index: 'two',
|
||||
},
|
||||
{
|
||||
title: '操作人',
|
||||
className: 'text-center',
|
||||
index: 'three',
|
||||
},
|
||||
{ title: '状态', index: 'externalSn', className: 'text-center' },
|
||||
{
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
className: 'text-left',
|
||||
buttons: [
|
||||
{
|
||||
text: '查看',
|
||||
click: (_record) => this.FloatView(_record),
|
||||
},
|
||||
{
|
||||
text: '撤销',
|
||||
click: (_record) => this.audit(_record),
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
}
|
||||
initSTFloatView() {
|
||||
this.columnsFloatView = [
|
||||
{
|
||||
title: '费用名称',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
render: 'goodsId'
|
||||
},
|
||||
{
|
||||
title: '变更前',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
},
|
||||
{ title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' },
|
||||
{ title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
|
||||
];
|
||||
}
|
||||
/**
|
||||
* 查询字段个数
|
||||
*/
|
||||
get queryFieldCount(): number {
|
||||
return Object.keys(this.schema?.properties || {}).length;
|
||||
}
|
||||
/**
|
||||
* 伸缩查询条件
|
||||
*/
|
||||
expandToggle(): void {
|
||||
this._$expand = !this._$expand;
|
||||
this.sf?.setValue('/_$expand', this._$expand);
|
||||
}
|
||||
tabChange(item: any) {
|
||||
console.log(item)
|
||||
}
|
||||
/**
|
||||
* 重置表单
|
||||
*/
|
||||
resetSF(): void {
|
||||
this.sf.reset();
|
||||
this._$expand = false;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// 获取录单员
|
||||
getCatalogueMember() {
|
||||
const params = {
|
||||
};
|
||||
return this.service.request(this.service.$api_get_catalogue_member, params, 'GET').pipe(
|
||||
map((res) => {
|
||||
if (res) {
|
||||
console.log(res)
|
||||
}
|
||||
}),
|
||||
);
|
||||
}
|
||||
|
||||
selectChange(e: number) {
|
||||
console.log(e);
|
||||
}
|
||||
/**
|
||||
* 导入货源
|
||||
*/
|
||||
importGoodsSource() {
|
||||
|
||||
}
|
||||
audit(item: any) {
|
||||
console.log(item)
|
||||
}
|
||||
|
||||
/*
|
||||
* 审核关闭弹窗
|
||||
view: 1
|
||||
浮动费用： 0
|
||||
查看评价： 3
|
||||
*/
|
||||
handleCancel(type: string) {
|
||||
console.log(type)
|
||||
if(type === '0') {
|
||||
this.isVisible = false
|
||||
} else if(type === '1') {
|
||||
console.log(type)
|
||||
this.isVisibleView = false
|
||||
} else if(type === '2') {
|
||||
console.log(type)
|
||||
this.isVisibleEvaluate = false
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 审核通过按钮
|
||||
*/
|
||||
handleOK() {
|
||||
|
||||
}
|
||||
OpenPrice() {
|
||||
this.isVisible = true
|
||||
}
|
||||
/**
|
||||
* 浮动费用查看
|
||||
*/
|
||||
FloatView(item: any) {
|
||||
console.log(item)
|
||||
this.isVisibleView = true
|
||||
}
|
||||
/**
|
||||
*查看评价
|
||||
*/
|
||||
viewEvaluate(item: any) {
|
||||
console.log(item)
|
||||
this.isVisibleEvaluate = true
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,6 @@
|
||||
<div nz-row style="margin-bottom: 24px">
|
||||
<!-- <div nz-col nzSpan="8">
|
||||
<input nz-input id="pickerInput" [(ngModel)]="addressInput" placeholder="请输入地址" />
|
||||
</div> -->
|
||||
</div>
|
||||
<div id="container" style="width: 800px; height: 500px"></div>
|
||||
@ -0,0 +1,70 @@
|
||||
import { Component, Input, OnInit, Output, EventEmitter } from '@angular/core';
|
||||
import { _HttpClient } from '@delon/theme';
|
||||
import * as $ from 'jquery';
|
||||
declare var AMapUI: any;
|
||||
declare var AMap: any;
|
||||
|
||||
@Component({
|
||||
selector: 'app-ordermanage-map',
|
||||
templateUrl: './gaode-map.component.html'
|
||||
})
|
||||
export class OrderManagementGaodeMapComponent implements OnInit {
|
||||
addressInput: any;
|
||||
constructor() {}
|
||||
ngOnInit(): void {
|
||||
this.PoiPicker();
|
||||
}
|
||||
|
||||
// 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('美食');
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -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('美食');
|
||||
});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!--
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 11:10:14
|
||||
* @LastEditTime: 2021-12-03 16:01:20
|
||||
* @LastEditTime: 2021-12-06 19:06:12
|
||||
* @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\vehicle\vehicle.component.html
|
||||
@ -36,7 +36,7 @@
|
||||
</nz-card>
|
||||
|
||||
<nz-card>
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
|
||||
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
|
||||
<nz-tab *ngFor="let tab of tabs; let i = index" [nzTitle]="tab.name + ' (' + tab.count + ') '" (nzClick)="tabChange(i)">
|
||||
</nz-tab>
|
||||
</nz-tabset>
|
||||
@ -45,16 +45,6 @@
|
||||
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
|
||||
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
|
||||
[loadingDelay]="500" [loading]="service.http.loading" -->
|
||||
<!-- 选中提示框 -->
|
||||
<div style="position: relative">
|
||||
<nz-alert
|
||||
nzType="info"
|
||||
[nzMessage]="'当前共' + st?.total + '行记录，已选择' + selectedRows.length + '项'"
|
||||
nzShowIcon
|
||||
[ngStyle]="{ margin: '0 0 1rem 0' }"
|
||||
>
|
||||
</nz-alert>
|
||||
</div>
|
||||
<st #st [scroll]="{ x: '1200px' }" [data]="service.$api_get_catalogue_member" [columns]="columns">
|
||||
<ng-template st-row="goodsId" let-item let-index="index">
|
||||
<a [routerLink]="'/order-management/vehicle-detail/'+item.id">{{item.no}}</a>
|
||||
@ -66,6 +56,11 @@
|
||||
<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 st-row="feiong" let-item let-index="index">
|
||||
<div style="color: aqua;" (click)="OpenPrice()">
|
||||
{{item.no}}
|
||||
</div>
|
||||
</ng-template>
|
||||
<ng-template #contentTemplate>
|
||||
<div>
|
||||
<p>预付：¥200.00</p>
|
||||
@ -79,30 +74,74 @@
|
||||
</st>
|
||||
</div>
|
||||
</nz-card>
|
||||
<ng-template #extraTemplate>
|
||||
<div>
|
||||
<button (click)="audit('',2)" nz-button nzType="primary">批量审核</button>
|
||||
<button (click)="importGoodsSource()" nz-button nzType="primary">发布货源</button>
|
||||
<button (click)="importGoodsSource()" nz-button nzType="primary">导入货源</button>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="货源审核" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('suppliersType')">
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisible" [nzWidth]="600" [nzFooter]="nzModalFooter" nzTitle="浮动费用" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('0')">
|
||||
<ng-container *nzModalContent>
|
||||
<div style="position: relative" *ngIf="auditMany">
|
||||
<nz-alert
|
||||
nzType="info"
|
||||
[nzMessage]="'已选择' + 6 + '项'"
|
||||
nzShowIcon
|
||||
[ngStyle]="{ margin: '0 0 1rem 0' }"
|
||||
>
|
||||
</nz-alert>
|
||||
</div>
|
||||
<sf #sfFre [schema]="freightSchema" [ui]="ui2" [compact]="false" [button]="'none'">
|
||||
</sf>
|
||||
<st
|
||||
#stFloat
|
||||
multiSort
|
||||
size="small"
|
||||
[bordered]="true"
|
||||
[data]="datass"
|
||||
[columns]="columnsFloat"
|
||||
[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] }"
|
||||
[loadingDelay]="500"
|
||||
>
|
||||
</st>
|
||||
</ng-container>
|
||||
<ng-template #nzModalFooter>
|
||||
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">通过</button>
|
||||
<button nz-button nzType="default" (click)="handleCancel('suppliersType')">不通过</button>
|
||||
<button nz-button nzType="primary" (click)="handleCancel('0')">取消</button>
|
||||
<button nz-button nzType="default" (click)="handleOK()">确定</button>
|
||||
</ng-template>
|
||||
</nz-modal>
|
||||
|
||||
|
||||
<nz-modal [(nzVisible)]="isVisibleView" [nzWidth]="600" [nzFooter]="nzModalFooterview" nzTitle="查看" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel('1')">
|
||||
<ng-container *nzModalContent>
|
||||
<st
|
||||
#stFloatView
|
||||
multiSort
|
||||
size="small"
|
||||
[bordered]="true"
|
||||
[data]="datass"
|
||||
[columns]="columnsFloatView"
|
||||
[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] }"
|
||||
[loadingDelay]="500"
|
||||
>
|
||||
</st>
|
||||
<div><span>变更原因：</span></div>
|
||||
<div><span>拒绝原因：</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)="handleOK()">确定</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>
|
||||
@ -1,6 +1,6 @@
|
||||
import { Component, OnInit, ViewChild } from '@angular/core';
|
||||
import { STColumn, STComponent } from '@delon/abc/st';
|
||||
import { SFComponent, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { SFComponent, SFDateWidgetSchema, SFSchema, SFSelectWidgetSchema, SFUISchema } from '@delon/form';
|
||||
import { ModalHelper, _HttpClient } from '@delon/theme';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { map } from 'rxjs/operators';
|
||||
@ -15,16 +15,34 @@ import { SupplyManagementService } from '../../services/order-management.service
|
||||
export class OrderManagementVehicleComponent implements OnInit {
|
||||
url = `/user?_allow_anonymous=true`;
|
||||
ui: SFUISchema = {};
|
||||
ui2: SFUISchema = {};
|
||||
schema: SFSchema = {};
|
||||
freightSchema: SFSchema = {};
|
||||
auditMany = false;
|
||||
isVisibleView = false;
|
||||
isVisibleEvaluate = false;
|
||||
isVisible = false;
|
||||
_$expand = false;
|
||||
@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;
|
||||
columns: STColumn[] = [];
|
||||
columnsFloat: STColumn[] = [];
|
||||
columnsFloatView: STColumn[] = [];
|
||||
datass: any = [
|
||||
{
|
||||
one: '1',
|
||||
two: '1',
|
||||
three: '1',
|
||||
id: 1
|
||||
},
|
||||
{
|
||||
one: '2',
|
||||
two: '2',
|
||||
three: '2',
|
||||
id: 2
|
||||
},
|
||||
];
|
||||
tabs = [ {
|
||||
name: '全部',
|
||||
type: 5,
|
||||
@ -36,7 +54,22 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
count: 0,
|
||||
},
|
||||
{
|
||||
name: '已接单',
|
||||
name: '待发车',
|
||||
type: 5,
|
||||
count: 0,
|
||||
},
|
||||
{
|
||||
name: '运输中',
|
||||
type: 5,
|
||||
count: 0,
|
||||
},
|
||||
{
|
||||
name: '代签收',
|
||||
type: 5,
|
||||
count: 0,
|
||||
},
|
||||
{
|
||||
name: '已完成',
|
||||
type: 5,
|
||||
count: 0,
|
||||
},
|
||||
@ -62,7 +95,8 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
ngOnInit(): void {
|
||||
this.initSF();
|
||||
this.initST();
|
||||
this.initSFFre();
|
||||
this.initSTFloat();
|
||||
this.initSTFloatView();
|
||||
}
|
||||
|
||||
|
||||
@ -76,18 +110,63 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
_$expand: { type: 'boolean', ui: { hidden: true } },
|
||||
no: {
|
||||
type: 'string',
|
||||
title: '货源编号',
|
||||
title: '订单号',
|
||||
},
|
||||
no2: {
|
||||
type: 'string',
|
||||
title: '装货地'
|
||||
title: '货源编号'
|
||||
},
|
||||
no1: {
|
||||
type: 'string',
|
||||
title: '卸货地'
|
||||
title: '托运人'
|
||||
},
|
||||
no3: {
|
||||
type: 'string',
|
||||
title: '装货地',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
},
|
||||
no4: {
|
||||
type: 'string',
|
||||
title: '卸货地',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
},
|
||||
no7: {
|
||||
type: 'string',
|
||||
title: '承运司机',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
},
|
||||
no9: {
|
||||
type: 'string',
|
||||
title: '车牌号',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
},
|
||||
no10: {
|
||||
type: 'string',
|
||||
title: '收款人',
|
||||
ui: {
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
}
|
||||
},
|
||||
sex: {
|
||||
title: '货物类型',
|
||||
title: '支付状态',
|
||||
type: 'string',
|
||||
default: 0,
|
||||
enum: [
|
||||
@ -103,9 +182,21 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
},
|
||||
} as SFSelectWidgetSchema,
|
||||
},
|
||||
createTime: {
|
||||
title: '创建时间',
|
||||
type: 'string',
|
||||
ui: {
|
||||
widget: 'date',
|
||||
mode: 'range',
|
||||
format: 'yyyy-MM-dd',
|
||||
visibleIf: {
|
||||
_$expand: (value: boolean) => value,
|
||||
},
|
||||
} as SFDateWidgetSchema,
|
||||
},
|
||||
appId: {
|
||||
type: 'string',
|
||||
title: '录单员',
|
||||
title: '是否风险单',
|
||||
ui: {
|
||||
widget: 'select',
|
||||
placeholder: '请选择',
|
||||
@ -119,24 +210,9 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
},
|
||||
type: 'object',
|
||||
};
|
||||
this.ui = { '*': { spanLabelFixed: 80, grid: { span: 8, gutter: 4 } } };
|
||||
}
|
||||
initSFFre() {
|
||||
this.freightSchema = {
|
||||
properties: {
|
||||
roleDescription: {
|
||||
title: '备注',
|
||||
type: 'string',
|
||||
maxLength: 50,
|
||||
ui: {
|
||||
placeholder: '请输入备注',
|
||||
widget: 'textarea',
|
||||
},
|
||||
},
|
||||
}
|
||||
};
|
||||
this.ui2 = { '*': { spanLabelFixed: 120, grid: { span: 24 } } };
|
||||
this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
|
||||
}
|
||||
|
||||
/**
|
||||
* 初始化数据列表
|
||||
*/
|
||||
@ -144,23 +220,19 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
this.columns = [
|
||||
{ title: '', type: 'checkbox', width: '50px', className: 'text-center' },
|
||||
{
|
||||
title: '货源编号',
|
||||
title: '运单号',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
render: 'goodsId'
|
||||
},
|
||||
{ title: '服务类型', index: 'externalSn', width: '120px', className: 'text-center' },
|
||||
{ title: '货主', index: 'linkUrl', width: '120px', className: 'text-center' },
|
||||
{
|
||||
title: '项目名称',
|
||||
title: '货源编号',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{ title: '托运人', index: 'externalSn', width: '120px', className: 'text-center' },
|
||||
{ title: '装货地', index: 'linkUrl', width: '120px', className: 'text-center' },
|
||||
{
|
||||
title: '装货地',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
}, {
|
||||
title: '卸货地',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
@ -169,34 +241,44 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
title: '货物名称',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '货物数量',
|
||||
}, {
|
||||
title: '重量/体积',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '用车需求',
|
||||
title: '承运司机',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '总费用',
|
||||
title: '车牌号',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '出价',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
index: 'goodsId',
|
||||
render: 'enStatusStr27878'
|
||||
},
|
||||
{
|
||||
title: '附加费',
|
||||
title: '浮动费用',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
render: 'feiong'
|
||||
},
|
||||
{
|
||||
title: '成交金额',
|
||||
className: 'text-center',
|
||||
width: '120px',
|
||||
},
|
||||
{
|
||||
title: '货源状态',
|
||||
title: '收款人',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr2',
|
||||
type: 'badge',
|
||||
width: '100px',
|
||||
badge: {
|
||||
正常: { text: '正常', color: 'success' },
|
||||
冻结: { text: '冻结', color: 'warning' },
|
||||
@ -204,15 +286,40 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '创建时间',
|
||||
title: '支付状态',
|
||||
width: '170px',
|
||||
className: 'text-center',
|
||||
},
|
||||
{
|
||||
title: '审核状态',
|
||||
title: '创建时间',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr3',
|
||||
type: 'badge',
|
||||
width: '100px',
|
||||
badge: {
|
||||
正常: { text: '正常', color: 'success' },
|
||||
冻结: { text: '冻结', color: 'warning' },
|
||||
废弃: { text: '废弃', color: 'default' },
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '异常原因',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr3',
|
||||
type: 'badge',
|
||||
width: '100px',
|
||||
badge: {
|
||||
正常: { text: '正常', color: 'success' },
|
||||
冻结: { text: '冻结', color: 'warning' },
|
||||
废弃: { text: '废弃', color: 'default' },
|
||||
},
|
||||
},
|
||||
{
|
||||
title: '运单状态',
|
||||
className: 'text-center',
|
||||
index: 'enStatusStr3',
|
||||
type: 'badge',
|
||||
width: '100px',
|
||||
badge: {
|
||||
正常: { text: '正常', color: 'success' },
|
||||
冻结: { text: '冻结', color: 'warning' },
|
||||
@ -223,40 +330,67 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
width: '200px',
|
||||
className: 'text-center',
|
||||
className: 'text-left',
|
||||
buttons: [
|
||||
{
|
||||
text: '货源审核',
|
||||
click: (_record) => this.audit(_record, 1),
|
||||
},
|
||||
{
|
||||
text: '修改货源',
|
||||
// click: (_record) => this.editOne(_record),
|
||||
},
|
||||
{
|
||||
text: '修改运费',
|
||||
click: (_record) => this.updateFreight(_record),
|
||||
},
|
||||
{
|
||||
text: '取消货源',
|
||||
// click: (_record) => this.delOne(_record),
|
||||
},
|
||||
{
|
||||
text: '再下一单',
|
||||
// click: (_record) => this.editOne(_record),
|
||||
},
|
||||
{
|
||||
text: '重新指派',
|
||||
click: (_record) => this.assignedCar(_record),
|
||||
text: '查看评价',
|
||||
click: (_record) => this.viewEvaluate(_record),
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
}
|
||||
add(): void {
|
||||
// this.modal
|
||||
// .createStatic(FormEditComponent, { i: { id: 0 } })
|
||||
// .subscribe(() => this.st.reload());
|
||||
initSTFloat() {
|
||||
this.columnsFloat = [
|
||||
{
|
||||
title: '序号',
|
||||
className: 'text-center',
|
||||
index: 'one',
|
||||
},
|
||||
{
|
||||
title: '操作时间',
|
||||
className: 'text-center',
|
||||
index: 'two',
|
||||
},
|
||||
{
|
||||
title: '操作人',
|
||||
className: 'text-center',
|
||||
index: 'three',
|
||||
},
|
||||
{ title: '状态', index: 'externalSn', className: 'text-center' },
|
||||
{
|
||||
title: '操作',
|
||||
fixed: 'right',
|
||||
className: 'text-left',
|
||||
buttons: [
|
||||
{
|
||||
text: '查看',
|
||||
click: (_record) => this.FloatView(_record),
|
||||
},
|
||||
{
|
||||
text: '撤销',
|
||||
click: (_record) => this.audit(_record),
|
||||
},
|
||||
],
|
||||
},
|
||||
];
|
||||
}
|
||||
initSTFloatView() {
|
||||
this.columnsFloatView = [
|
||||
{
|
||||
title: '费用名称',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
render: 'goodsId'
|
||||
},
|
||||
{
|
||||
title: '变更前',
|
||||
width: '100px',
|
||||
className: 'text-center',
|
||||
},
|
||||
{ title: '变更值', index: 'externalSn', width: '120px', className: 'text-center' },
|
||||
{ title: '变更后', index: 'externalSn', width: '120px', className: 'text-center' }
|
||||
];
|
||||
}
|
||||
/**
|
||||
* 查询字段个数
|
||||
@ -300,77 +434,33 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
selectChange(e: number) {
|
||||
console.log(e);
|
||||
}
|
||||
|
||||
/**
|
||||
* 编辑外部货源号
|
||||
* @param item st当前行对象
|
||||
*/
|
||||
editEnternalSn(item: any) {
|
||||
const modalRef = this.modal.create({
|
||||
nzWidth: '400px',
|
||||
// nzContent: SupplyManagementUpdateExternalSnComponent,
|
||||
nzComponentParams: {
|
||||
orderObject: item,
|
||||
},
|
||||
nzFooter: null,
|
||||
nzClosable: false
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 导入货源
|
||||
*/
|
||||
importGoodsSource() {
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改运费
|
||||
*/
|
||||
updateFreight(item: any) {
|
||||
const modalRef = this.modal.create({
|
||||
nzTitle: '修改运费',
|
||||
nzWidth: '40%',
|
||||
// nzContent: SupplyManagementUpdateFreightComponent,
|
||||
nzComponentParams: {
|
||||
i: item,
|
||||
},
|
||||
nzFooter: null,
|
||||
});
|
||||
audit(item: any) {
|
||||
console.log(item)
|
||||
}
|
||||
|
||||
/**
|
||||
* 重新指派
|
||||
*/
|
||||
assignedCar(item: any) {
|
||||
const modalRef = this.modal.create({
|
||||
nzTitle: '指派熟车',
|
||||
nzWidth: '800px',
|
||||
// nzContent: SupplyManagementAssignedCarComponent,
|
||||
nzComponentParams: {
|
||||
i: item,
|
||||
},
|
||||
nzFooter: null,
|
||||
});
|
||||
}
|
||||
/**
|
||||
* 审核
|
||||
*/
|
||||
audit(value: any, status?: any) {
|
||||
console.log(value)
|
||||
console.log(status)
|
||||
if(status === 2) {
|
||||
this.auditMany = true;
|
||||
} else {
|
||||
this.auditMany = false;
|
||||
}
|
||||
this.isVisible = true;
|
||||
}
|
||||
/**
|
||||
/*
|
||||
* 审核关闭弹窗
|
||||
view: 1
|
||||
浮动费用： 0
|
||||
查看评价： 3
|
||||
*/
|
||||
handleCancel(type: any) {
|
||||
handleCancel(type: string) {
|
||||
console.log(type)
|
||||
if(type === '0') {
|
||||
this.isVisible = false
|
||||
} else if(type === '1') {
|
||||
console.log(type)
|
||||
this.isVisibleView = false
|
||||
} else if(type === '2') {
|
||||
console.log(type)
|
||||
this.isVisibleEvaluate = false
|
||||
}
|
||||
}
|
||||
/**
|
||||
* 审核通过按钮
|
||||
@ -378,4 +468,21 @@ export class OrderManagementVehicleComponent implements OnInit {
|
||||
handleOK() {
|
||||
|
||||
}
|
||||
OpenPrice() {
|
||||
this.isVisible = true
|
||||
}
|
||||
/**
|
||||
* 浮动费用查看
|
||||
*/
|
||||
FloatView(item: any) {
|
||||
console.log(item)
|
||||
this.isVisibleView = true
|
||||
}
|
||||
/**
|
||||
*查看评价
|
||||
*/
|
||||
viewEvaluate(item: any) {
|
||||
console.log(item)
|
||||
this.isVisibleEvaluate = true
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,19 +1,22 @@
|
||||
/*
|
||||
* @Author: your name
|
||||
* @Date: 2021-12-03 15:31:52
|
||||
* @LastEditTime: 2021-12-03 16:02:33
|
||||
* @LastEditTime: 2021-12-06 20:21:41
|
||||
* @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\order-management-routing.module.ts
|
||||
*/
|
||||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule, Routes } from '@angular/router';
|
||||
import { OrderManagementBulkComponent } from './components/bulk/bulk.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: 'bulk', component: OrderManagementBulkComponent },
|
||||
{ path: 'bulk-detail/:id', component: OrderManagementVehicleDetailComponent },
|
||||
]
|
||||
@NgModule({
|
||||
imports: [RouterModule.forChild(routes)],
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
import { NgModule, Type } from '@angular/core';
|
||||
import { SharedModule } from '@shared';
|
||||
import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component';
|
||||
import { OrderManagementBulkComponent } from './components/bulk/bulk.component';
|
||||
import { OrderManagementGaodeMapComponent } from './components/gaode-map/gaode-map.component';
|
||||
import { OrderManagementVehicleDetailComponent } from './components/vehicle-detail/vehicle-detail.component';
|
||||
|
||||
import { OrderManagementVehicleComponent } from './components/vehicle/vehicle.component';
|
||||
@ -7,7 +10,10 @@ import { OrderManagementRoutingModule } from './order-management-routing.module'
|
||||
|
||||
const COMPONENTS: Type<void>[] = [
|
||||
OrderManagementVehicleComponent,
|
||||
OrderManagementVehicleDetailComponent
|
||||
OrderManagementVehicleDetailComponent,
|
||||
OrderManagementGaodeMapComponent,
|
||||
OrderManagementBulkComponent,
|
||||
OrderManagementBulkeDetailComponent
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
|
||||
@ -171,18 +171,30 @@
|
||||
"text": "订单管理",
|
||||
"icon": "anticon anticon-dashboard",
|
||||
"group": true,
|
||||
"children": [{
|
||||
"children": [
|
||||
{
|
||||
"text": "整车订单",
|
||||
"icon": "anticon anticon-dashboard",
|
||||
"link": "/order-management/vehicle",
|
||||
"reuse": true
|
||||
},
|
||||
{
|
||||
"text": "大宗订单",
|
||||
"icon": "anticon anticon-dashboard",
|
||||
"link": "/order-management/bulk"
|
||||
},
|
||||
{
|
||||
"text": "整车订单详情",
|
||||
"icon": "anticon anticon-dashboard",
|
||||
"link": "/order-management/vehicle-detail/:id",
|
||||
"hide": true
|
||||
},
|
||||
{
|
||||
"text": "大宗订单详情",
|
||||
"icon": "anticon anticon-dashboard",
|
||||
"link": "/order-management/bulk-detail/:id",
|
||||
"hide": true
|
||||
},
|
||||
{
|
||||
"text": "货源详情",
|
||||
"icon": "anticon anticon-dashboard",
|
||||
|
||||
Reference in New Issue
Block a user