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

edit

Browse Source
This commit is contained in:
Taric Xin
2022-03-10 19:13:34 +08:00
parent d81ae173e2
commit 268919bda5
6 changed files with 153 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/vehicle/components/audit/detail/detail.component.html
View File

@ -1,5 +1,5 @@
<!-- 页头 -->
<page-header-wrapper [logo]="logo" title="车辆详情" [content]="content">
<page-header-wrapper [logo]="logo" title="车辆详情" [content]="content" [ngClass]="{'affix': scrollTop>210}">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>

28
src/app/routes/vehicle/components/audit/detail/detail.component.less
View File

@ -106,9 +106,37 @@
letter-spacing: 0.7px;
}
}
input {
width: 200px;
}
.sv__container {
padding-top: 10px;
}
::ng-deep {
.affix {
position: fixed;
top : 20px !important;
right : 25px;
left : 25px;
z-index : 999 !important;
}
.alain-pro__menu-side .alain-pro__main {
.affix {
position: fixed;
top : 20px !important;
right : 25px;
left : 250px;
z-index : 999 !important;
}
}
.aside-collapsed.alain-pro__menu-side .alain-pro__main {
.affix {
left: 106px;
}
}
}

15
src/app/routes/vehicle/components/audit/detail/detail.component.ts
View File

@ -1,4 +1,4 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { apiConf } from '@conf/api.conf';
import { STColumn, STComponent } from '@delon/abc/st';
@ -15,13 +15,14 @@ import { EADateUtil } from '@shared';
import { VehicleImgViewComponent } from '../../list/img-view/img-view.component';
import { VehicleComponentsListEditComponent } from '../../list/edit/edit.component';
import { NzImageService } from 'ng-zorro-antd/image';
import { fromEvent, Subscription } from 'rxjs';
@Component({
selector: 'app-Vehicle-components-Audit-detail',
templateUrl: './detail.component.html',
styleUrls: ['./detail.component.less']
})
export class VehicleComponentsAuditDetailComponent implements OnInit {
export class VehicleComponentsAuditDetailComponent implements OnInit, OnDestroy {
@ViewChild('st', { static: false }) st!: STComponent;
@ViewChild('redectModal', { static: false }) redectModal!: any;
columns!: STColumn[];
@ -34,6 +35,10 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
approvalOpinion = '';
uploadURl = apiConf.waterFileUpload;
disabledUpload = false;
scrollTop = 0;
subscribeScoll!: Subscription;
constructor(
public service: VehicleService,
private route: ActivatedRoute,
@ -41,11 +46,17 @@ export class VehicleComponentsAuditDetailComponent implements OnInit {
private modal: ModalHelper,
private nzImageService: NzImageService
) {}
ngOnDestroy(): void {
this.subscribeScoll.unsubscribe();
}
ngOnInit() {
this.getSelectList();
this.getDetailList();
this.initST();
this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => {
this.scrollTop = document.documentElement.scrollTop;
});
}
initST() {

2
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -6,7 +6,7 @@
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html
-->
<page-header-wrapper [title]="'整车运单详情'" [logo]="logo" [content]="headerContent">
<page-header-wrapper [title]="'整车运单详情'" [logo]="logo" [content]="headerContent" [ngClass]="{'affix': scrollTop>210}">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
<i nz-icon nzType="left" nzTheme="outline"></i>

75
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less
View File

@ -1,53 +1,60 @@
:host{
.btn-size{
:host {
.btn-size {
font-size: 14px;
}
.bdr{
.bdr {
border-right: 1px solid #ccc;
}
.bdl{
.bdl {
border-left: 1px solid #ccc;
}
.source-info{
p{
.source-info {
p {
margin-bottom: .5em;
}
}
.freight-info-box{
.freight-info-box {
width: 95%;
}
.freigth-label{
display: inline-block;
width: 50px;
.freigth-label {
display : inline-block;
width : 50px;
text-align: right;
}
::ng-deep{
.approval-status{
.ant-steps{
width: 70%;
::ng-deep {
.approval-status {
.ant-steps {
width : 70%;
margin: 0 auto;
}
}
}
.leftPadding {
padding-right: 100px;
}
.handling-info {
min-height: 100px;
border: 1px solid #ccc;
border : 1px solid #ccc;
.loading-row {
display: flex;
}
.handling-info-icon {
width: 32px;
height: 32px;
margin-right: 24px;
color: #fff;
line-height: 32px;
text-align: center;
width : 32px;
height : 32px;
margin-right : 24px;
color : #fff;
line-height : 32px;
text-align : center;
border-radius: 50%;
&.loading-bg {
@ -68,3 +75,29 @@
}
}
}
::ng-deep {
.affix {
position: fixed;
top : 20px !important;
right : 25px;
left : 25px;
z-index : 999 !important;
}
.alain-pro__menu-side .alain-pro__main {
.affix {
position: fixed;
top : 20px !important;
right : 25px;
left : 250px;
z-index : 999 !important;
}
}
.aside-collapsed.alain-pro__menu-side .alain-pro__main {
.affix {
left: 106px;
}
}
}

15
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -6,7 +6,7 @@
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts
*/
import { Component, OnInit } from '@angular/core';
import { Component, OnDestroy, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
@ -14,6 +14,7 @@ import format from 'date-fns/format';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';
import { Subscription, fromEvent } from 'rxjs';
import { VehicleSureArriveComponent } from 'src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component';
import { VehicleSureDepartComponent } from 'src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component';
import { WaybillManagementServe } from '../../services/waybill-management.service';
@ -22,7 +23,7 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic
templateUrl: './vehicle-detail.component.html',
styleUrls: ['./vehicle-detail.component.less']
})
export class WaybillManagementVehicleDetailComponent implements OnInit {
export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestroy {
id = this.route.snapshot.params.id;
MapList: any[]=[];
@ -53,6 +54,8 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
}
];
scrollTop = 0;
subscribeScoll!: Subscription;
constructor(
private route: ActivatedRoute,
private msgSrv: NzMessageService,
@ -62,9 +65,17 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
}
ngOnDestroy(): void {
this.subscribeScoll.unsubscribe();
}
ngOnInit(): void {
this.initData()
this.getTrajectory()
this.subscribeScoll = fromEvent(window, 'scroll').subscribe(event => {
this.scrollTop = document.documentElement.scrollTop;
});
}
initData() {
const params = {