订单

src/app/routes/order-management/components/additionalc-detail/additionalc-detail.component.html

@@ -0,0 +1,151 @@
+<!--
+ * @Author: your name
+ * @Date: 2021-12-03 15:31:52
+ * @LastEditTime: 2021-12-07 14:17:30
+ * @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">待接单555</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 nz-row > 
+    <div nz-col [nzSpan]='12'>
+      <div  style="position: relative;">
+        <div style="height: 24px; width: 90px; background-color: #68758e;position: absolute; top: -109%; left: 0%;color: #fff;text-align: center;">平台支付</div>
+        <span class="leftPadding">司机运输费666</span>
+        <span class="leftPadding">1000.00</span>
+        <span class="leftPadding">未支付</span>
+      </div>
+    </div>
+    <div nz-col [nzSpan]='12'>
+      <div style="position: relative;">
+        <div style="height: 24px; width: 90px; background-color: #68758e;position: absolute; top: -109%; left: 0%;color: #fff;text-align: center;">货主支付</div>
+        <span class="leftPadding">司机运输费22</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>
+    </nz-card>
+  </div>
+</nz-card>
+
+

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;
+    }
+}

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<OrderManagementAdditionalcDetailComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ OrderManagementAdditionalcDetailComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(OrderManagementAdditionalcDetailComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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);
+  }
+  
+}

src/app/routes/order-management/components/additionalc/additionalc.component.html

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-12-03 11:10:14
- * @LastEditTime: 2021-12-07 11:16:41
+ * @LastEditTime: 2021-12-07 14:10:33
  * @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
@@ -50,7 +50,7 @@
       [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>
+        <a [routerLink]="'/order-management/additionalc-detail/'+item.id">{{item.no}}</a>
       </ng-template>
     </st>
   </div>

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)],

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<void>[] = [
   OrderManagementBulkeDetailComponent,
   OrderManagementDriverManageComponent,
   OrderManagementCarManageComponent,
-  OrderManagementAdditionalcComponent
+  OrderManagementAdditionalcComponent,
+  OrderManagementAdditionalcDetailComponent
 ];
 
 @NgModule({

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
                 }
                ]
             },