From 841a0d2055d510e093b8f0184d7677314e01e7d9 Mon Sep 17 00:00:00 2001 From: wangshiming Date: Tue, 7 Dec 2021 14:19:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../additionalc-detail.component.html | 151 ++++++++++++++++++ .../additionalc-detail.component.less | 36 +++++ .../additionalc-detail.component.spec.ts | 32 ++++ .../additionalc-detail.component.ts | 60 +++++++ .../additionalc/additionalc.component.html | 4 +- .../order-management-routing.module.ts | 4 +- .../order-management.module.ts | 12 +- src/assets/mocks/menu-data.json | 6 + 8 files changed, 301 insertions(+), 4 deletions(-) create mode 100644 src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.html create mode 100644 src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.less create mode 100644 src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.spec.ts create mode 100644 src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.ts diff --git a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.html b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.html new file mode 100644 index 00000000..cad943b2 --- /dev/null +++ b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.html @@ -0,0 +1,151 @@ + + + + + + + + +
+
+ + {{ i?.no }} + 待接单555 + + + + +
+
+ + + + +
+
+ +
+ {{ i?.owner }} + 32943898021309809423 + 3321944288191034921 + 18112345678 +
+ +
+
+
+

装卸货信息

+

装货地：广东省深圳市龙岗区怡亚通大厦

+

联系人：奥利给/13680058545

+

卸货地：广东省深圳市福田区岗厦村9巷8号405（新村）

+

联系人：花花世界/13680058545

+

发货日期：广东省深圳市福田区岗厦村9巷8号405（新村）

+

卸货日期：花花世界/13680058545

+
+
+
+
+

货物信息

+

货物名称：广东省深圳市龙岗区怡亚通大厦

+

重量/体积：广东省深圳市福田区岗厦村9巷8号405（新村）

+

车型/车长：花花世界/13680058545

+
+
+
+
+

托运信息

+

公司名称：广东省深圳市龙岗区怡亚通大厦

+

联系人：广东省深圳市福田区岗厦村9巷8号405（新村）

+
+
+
+
+

承运信息

+

司机：广东省深圳市龙岗区怡亚通大厦

+

车牌号：广东省深圳市福田区岗厦村9巷8号405（新村）

+

车型/车长/承重：{{'拖车'}} | {{'4.5米'}} | {{'15吨'}}

+
+
+
+

补充信息

+

协议附件

+

装车附件

+

卸货附件

+

回单附件

+
+
+ +
+
+

运费信息

+
+

{{400 | currency }}

+

{{400 | currency }}

+

{{400 | currency }}

+

{{400 | currency }}

+

{{400 | currency}}

+

{{400 | currency }}

+
+
+ +
+
+

{{400 | currency }}

+

未支付

+
+ +
+
+ +
+
+
+
平台支付
+ 司机运输费666 + 1000.00 + 未支付 +
+
+
+
+
货主支付
+ 司机运输费22 + 1000.00 + 未支付 +
+
+ 附加费 + 1000.00 + 未支付 +
+
+
+ + +
+ +
+ + +
+
+ +
+ +
+ + + diff --git a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.less b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.less new file mode 100644 index 00000000..3cd8c1be --- /dev/null +++ b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.less @@ -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; + } +} \ No newline at end of file diff --git a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.spec.ts b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.spec.ts new file mode 100644 index 00000000..4ecfc74a --- /dev/null +++ b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.spec.ts @@ -0,0 +1,32 @@ +/* + * @Author: your name + * @Date: 2021-12-07 14:04:46 + * @LastEditTime: 2021-12-07 14:06: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\additionalc-detail\additionalc-detail.component.spec.ts + */ +import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing'; +import { OrderManagementAdditionalcDetailComponent } from './additionalc-detail.component'; + +describe('OrderManagementAdditionalcDetailComponent', () => { + let component: OrderManagementAdditionalcDetailComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ OrderManagementAdditionalcDetailComponent ] + }) + .compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(OrderManagementAdditionalcDetailComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.ts b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.ts new file mode 100644 index 00000000..2a01d994 --- /dev/null +++ b/src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.ts @@ -0,0 +1,60 @@ +/* + * @Author: your name + * @Date: 2021-12-03 15:31:52 + * @LastEditTime: 2021-12-06 20:34:08 + * @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'; +@Component({ + selector: 'app-supply-management-additionalc-detail', + templateUrl: './additionalc-detail.component.html', + styleUrls: ['./additionalc-detail.component.less'] +}) +export class OrderManagementAdditionalcDetailComponent 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); + } + +} diff --git a/src/app/routes/order-management/components/additionalc/additionalc.component.html b/src/app/routes/order-management/components/additionalc/additionalc.component.html index e946d44f..4fda9bc3 100644 --- a/src/app/routes/order-management/components/additionalc/additionalc.component.html +++ b/src/app/routes/order-management/components/additionalc/additionalc.component.html @@ -1,7 +1,7 @@ - {{item.no}} + {{item.no}} diff --git a/src/app/routes/order-management/order-management-routing.module.ts b/src/app/routes/order-management/order-management-routing.module.ts index 28961a94..82709dcc 100644 --- a/src/app/routes/order-management/order-management-routing.module.ts +++ b/src/app/routes/order-management/order-management-routing.module.ts @@ -1,13 +1,14 @@ /* * @Author: your name * @Date: 2021-12-03 15:31:52 - * @LastEditTime: 2021-12-07 09:59:57 + * @LastEditTime: 2021-12-07 14:06: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\order-management\order-management-routing.module.ts */ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; +import { OrderManagementAdditionalcDetailComponent } from './components/additionalc-detail/additionalc-detail.component'; import { OrderManagementAdditionalcComponent } from './components/additionalc/additionalc.component'; import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component'; import { OrderManagementBulkComponent } from './components/bulk/bulk.component'; @@ -24,6 +25,7 @@ const routes: Routes = [ { path: 'driver-manage', component: OrderManagementDriverManageComponent }, { path: 'car-manage', component: OrderManagementCarManageComponent }, { path: 'additionalc', component: OrderManagementAdditionalcComponent }, + { path: 'additionalc-detail/:id', component: OrderManagementAdditionalcDetailComponent }, ] @NgModule({ imports: [RouterModule.forChild(routes)], diff --git a/src/app/routes/order-management/order-management.module.ts b/src/app/routes/order-management/order-management.module.ts index c437d7a0..dfcea5e7 100644 --- a/src/app/routes/order-management/order-management.module.ts +++ b/src/app/routes/order-management/order-management.module.ts @@ -1,5 +1,14 @@ +/* + * @Author: your name + * @Date: 2021-12-03 15:31:52 + * @LastEditTime: 2021-12-07 14:11:17 + * @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\order-management.module.ts + */ import { NgModule, Type } from '@angular/core'; import { SharedModule } from '@shared'; +import { OrderManagementAdditionalcDetailComponent } from './components/additionalc-detail/additionalc-detail.component'; import { OrderManagementAdditionalcComponent } from './components/additionalc/additionalc.component'; import { OrderManagementBulkeDetailComponent } from './components/bulk-detail/bulk-detail.component'; import { OrderManagementBulkComponent } from './components/bulk/bulk.component'; @@ -17,7 +26,8 @@ const COMPONENTS: Type[] = [ OrderManagementBulkeDetailComponent, OrderManagementDriverManageComponent, OrderManagementCarManageComponent, - OrderManagementAdditionalcComponent + OrderManagementAdditionalcComponent, + OrderManagementAdditionalcDetailComponent ]; @NgModule({ diff --git a/src/assets/mocks/menu-data.json b/src/assets/mocks/menu-data.json index dd98cd3e..fdc984e7 100644 --- a/src/assets/mocks/menu-data.json +++ b/src/assets/mocks/menu-data.json @@ -205,6 +205,12 @@ "text": "补录运单", "icon": "anticon anticon-dashboard", "link": "/order-management/additionalc" + }, + { + "text": "补录运单详情", + "icon": "anticon anticon-dashboard", + "link": "/order-management/additionalc-detail/:id", + "hide": true } ] },