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

批量审核

Browse Source
This commit is contained in:
wangshiming
2022-01-18 17:44:03 +08:00
parent a8a9565b40
commit 8bf3a60425
94 changed files with 2205 additions and 2001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 15:29: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\order-management\components\vehicle-detail\vehicle-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:29
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">

16
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -1,12 +1,14 @@
import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-05 14:33:56
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:37
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { ViewChild } from '@angular/core';
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';

14
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 19:44:00
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
<ng-template #logo>

16
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -1,12 +1,14 @@
import { Router } from '@angular/router';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 10:10:21
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-06 20:20:26
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:24
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Router } from '@angular/router';
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
import { STColumn } from '@delon/abc/st';

14
src/app/routes/order-management/components/bulk/bulk.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-18 14:43:58
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:56
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">

23
src/app/routes/order-management/components/bulk/bulk.component.spec.ts
View File

@ -1,19 +1,14 @@
/*
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-06 20:03:28
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:06
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk\\bulk.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementBulkComponent } from './bulk.component';

14
src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-16 10:19:08
* @LastEditTime: 2022-01-13 14:44: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\risk-detail\risk-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-04 17:29:18
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:54
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint-detail\\complaint-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="'投诉管理'" [logo]="logo">
<ng-template #logo>

14
src/app/routes/order-management/components/complaint-detail/complaint-detail.component.spec.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2022-01-04 17:29:18
* @LastEditTime: 2022-01-04 17:31:21
* @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\complaint-detail\complaint-detail.component.spec.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-04 17:29:18
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:01
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint-detail\\complaint-detail.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementComplaintDetailComponent } from './complaint-detail.component';

15
src/app/routes/order-management/components/complaint/complaint.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-13 20:59: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\supply-management\components\vehicle\vehicle.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:42
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">
</page-header-wrapper>

14
src/app/routes/order-management/components/complaint/complaint.component.spec.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2021-12-07 14:27:59
* @LastEditTime: 2021-12-07 14:28:59
* @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\risk\risk.component.spec.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-07 14:46:19
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:18:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint\\complaint.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementComplaintComponent } from './complaint.component';

19
src/app/routes/order-management/components/risk-detail/risk-detail.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-16 10:19:08
* @LastEditTime: 2021-12-17 11:21:28
* @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\risk-detail\risk-detail.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-16 10:19:08
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:25
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk-detail\\risk-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo">
<ng-template #logo>
@ -31,16 +33,11 @@
<sv label="异常原因" col="1">
<div class="bg-grey-lighter p-sm">
{{datailList?.abnormalCause}}
<!-- <div *ngFor="let item of abnormalReason">{{item}}</div> -->
</div>
</sv>
</sv-container>
</nz-card>
<!-- [nzExtra]="extraTemplate" -->
<nz-card nzTitle="申诉信息" >
<!-- <ng-template #extraTemplate>
<button nzType="primary" (click)="edit(i)" nzGhost nz-button>编辑</button>
</ng-template> -->
<sf #sf [compact]="true" [ui]="ui" [schema]="schema" [button]="'none'" *ngIf="schema" [formData]="datailList">
<ng-template sf-template="enterpriseQualificationCe" let-schema="schema" let-item let-ui="ui">
<app-imagelist [imgList]="datailList?.fileArr"></app-imagelist>

14
src/app/routes/order-management/components/risk/risk.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2021-12-24 15:36:09
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:12
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">

14
src/app/routes/order-management/components/risk/risk.component.spec.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2021-12-07 14:27:59
* @LastEditTime: 2021-12-07 14:28:59
* @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\risk\risk.component.spec.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-07 14:27:59
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:18
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\risk\\risk.component.spec.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
import { OrderManagementRiskComponent } from './risk.component';

198
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-17 15:01:35
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:14
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
<ng-template #logo>
<button nz-button nz-tooltip nzTooltipTitle="返回上一页" (click)="goBack()">
@ -14,10 +17,10 @@
</ng-template>
<ng-template #headerContent>
<div class="mb-xs" nz-row>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{i?.billStatusLabel}}</button>
<h4 class="ml-md" style="font-size: 18px;">订单号: {{ i?.billCode }}</h4>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.billStatusLabel }}</button>
<h4 class="ml-md" style="font-size: 18px">订单号: {{ i?.billCode }}</h4>
</div>
<div nz-row style="display: flex; justify-content: end;">
<div nz-row style="display: flex; justify-content: end">
<div nz-col nzSpan="10">
<button nz-button (click)="cancelChange()">取消修改</button>
<button nz-button nzType="primary" (click)="save()" nzGhost>保存修改</button>
@ -28,25 +31,19 @@
<div sv-container>
<sv label="网络货运人">{{ i?.goodsResource?.enterpriseInfoName }} </sv>
<sv label="货主">{{ i?.goodsResource?.shipperAppUserName }} </sv>
<sv label="所属项目">{{i?.goodsResource?.enterpriseProjectName}}</sv>
<sv label="服务类型">{{i?.goodsResource?.serviceTypeLabel}}</sv>
<sv label="录单员">{{i?.goodsResource?.createUserName}} /{{i?.goodsResource?.createUserPhone}} </sv>
<sv label="调度员">{{i?.goodsResource?.dispatchName}}/{{i?.goodsResource?.dispatchName}} </sv>
<sv label="所属项目">{{ i?.goodsResource?.enterpriseProjectName }}</sv>
<sv label="服务类型">{{ i?.goodsResource?.serviceTypeLabel }}</sv>
<sv label="录单员">{{ i?.goodsResource?.createUserName }} /{{ i?.goodsResource?.createUserPhone }} </sv>
<sv label="调度员">{{ i?.goodsResource?.dispatchName }}/{{ i?.goodsResource?.dispatchName }} </sv>
</div>
<nz-tabset style="margin-top: 15px;">
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)">
</nz-tab>
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)">
</nz-tab>
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)">
</nz-tab>
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)">
</nz-tab>
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)">
</nz-tab>
<nz-tabset style="margin-top: 15px">
<nz-tab nzTitle="装卸货信息" (nzClick)="goDistance(distannce1)"> </nz-tab>
<nz-tab nzTitle="基本信息" (nzClick)="goDistance(distannce2)"> </nz-tab>
<nz-tab nzTitle="运费信息" (nzClick)="goDistance(distannce3)"> </nz-tab>
<nz-tab nzTitle="附件信息" (nzClick)="goDistance(distannce4)"> </nz-tab>
<nz-tab nzTitle="轨迹信息" (nzClick)="goDistance(distannce5)"> </nz-tab>
</nz-tabset>
</div>
</ng-template>
</page-header-wrapper>
@ -54,21 +51,28 @@
<div class="approval-status">
<div style="width: 60%; margin: 0 auto">
<nz-steps [nzLabelPlacement]="'vertical'">
<nz-step [nzStatus]="i?.resourceStatus !== '1'?'finish':'process'" nzIcon="solution"
[nzDescription]="i?.createAt" nzTitle="下单"></nz-step>
<nz-step
[nzStatus]="i?.resourceStatus !== '1' ? 'finish' : 'process'"
nzIcon="solution"
[nzDescription]="i?.createAt"
nzTitle="下单"
></nz-step>
<nz-step
*ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2'"
[nzStatus]="i?.resourceStatus === '1' ? 'wait' : 'finish'"
nzIcon="file-done"
[nzTitle]="'接单'"
></nz-step>
<nz-step *ngIf="i?.resourceStatus === '1' || i?.resourceStatus === '2' "
[nzStatus]="i?.resourceStatus=== '1'? 'wait':'finish'" nzIcon="file-done" [nzTitle]="'接单'"></nz-step>
<nz-step nzStatus="finish" nzIcon="close-circle" nzTitle="取消货源" *ngIf="i?.resourceStatus === '3'"></nz-step>
</nz-steps>
</div>
</div>
</nz-card>
<nz-card>
<div class="card-title"
<div class="card-title"
>装卸货信息<span class="tip-font">预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时</span></div
>
<form nz-form [formGroup]="validateForm1" role="form">
@ -88,7 +92,7 @@
placeholder="请输入装货地"
/>
</nz-input-group>
<span style="padding: 0 10px"
<span style="padding: 0 10px"
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
></span>
</div>
@ -99,7 +103,13 @@
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
<div class="align-center">
<input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
<input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
<input
style="margin-left: 12px"
nz-input
[(ngModel)]="data.contractTelephone"
[ngModelOptions]="{ standalone: true }"
maxlength="11"
/>
</div>
</nz-form-control>
</nz-form-item>
@ -125,7 +135,7 @@
placeholder="请输入卸货地"
/>
</nz-input-group>
<span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
<span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
</div>
</nz-form-control>
</nz-form-item>
@ -134,19 +144,25 @@
<nz-form-control [nzErrorTip]="'请输入联系人信息'">
<div class="align-center">
<input nz-input [(ngModel)]="data.appUserName" [ngModelOptions]="{ standalone: true }" maxlength="30" />
<input style="margin-left: 12px" nz-input [(ngModel)]="data.contractTelephone" [ngModelOptions]="{ standalone: true }" maxlength="11" />
<input
style="margin-left: 12px"
nz-input
[(ngModel)]="data.contractTelephone"
[ngModelOptions]="{ standalone: true }"
maxlength="11"
/>
</div>
</nz-form-control>
</nz-form-item>
</div>
</div>
</div>
<div nz-row [nzGutter]="24" style="margin-top: 24px">
<div nz-row [nzGutter]="24" style="margin-top: 24px">
<div nz-col [nzSpan]="9">
<p class="time-info">计划装货时间：{{i?.loadPlanTime}}</p>
<p class="time-info">计划装货时间：{{ i?.loadPlanTime }}</p>
</div>
<div nz-col [nzSpan]="8">
<p class="time-info">计划卸货时间：{{i?.unloadPlanTime}}</p>
<p class="time-info">计划卸货时间：{{ i?.unloadPlanTime }}</p>
</div>
</div>
<ng-template #endInconTemp1><i nz-icon nzType="global"></i></ng-template>
@ -183,7 +199,7 @@
/>
</nz-input-group>
</ng-template>
<ng-template sf-template="number" let-item let-ui="ui">
<nz-input-group [nzAddOnAfter]="'车'">
<input
@ -199,35 +215,31 @@
</ng-template>
<ng-template sf-template="carmand" let-item let-ui="ui">
{{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCubeLabel}}
{{i?.goodsInfoList?.[0]?.maxWeightLabel}}/{{i?.goodsInfoList?.[0]?.maxCubeLabel}}
</ng-template>
<ng-template sf-template="drivers" let-item let-ui="ui">
{{i?.driverId}}
</ng-template>
{{ i?.driverId }}
</ng-template>
<ng-template sf-template="weightModel" let-item let-ui="ui">
<ng-template sf-template="weightModel" let-item let-ui="ui">
{{i?.goodsInfoList?.[0]?.weight}}顿,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件
</ng-template>
<ng-template sf-template="loadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="loadTime"></nz-date-picker>
<ng-template sf-template="loadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="loadTime"></nz-date-picker>
</ng-template>
<ng-template sf-template="unloadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadTime"></nz-date-picker>
<ng-template sf-template="unloadTime" let-item let-ui="ui">
<nz-date-picker nzShowTime nzFormat="yyyy-MM-dd HH:mm:ss" [(ngModel)]="unloadTime"></nz-date-picker>
</ng-template>
</sf>
</div>
</div>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st>
<div>总计：{{i?.total | currency: '￥'}}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"> </st>
<div>总计：{{ i?.total | currency: '￥' }}（运费￥3500.00，附加运费￥191.98，附加费率3.5%）</div>
<div>收款人：</div>
</nz-card>
@ -246,72 +258,70 @@
<nz-card nzTitle="补充信息">
<sv-container>
<sv label="是否回单">
{{i?.goodsResource?.stateReceipt ?'是':'否'}}
{{ i?.goodsResource?.stateReceipt ? '是' : '否' }}
</sv>
<sv label="回单类型">
{{i?.goodsResource?.receiptTypeLabel}}
</sv>
<sv label="联系人">
{{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
{{ i?.goodsResource?.receiptTypeLabel }}
</sv>
<sv label="联系人"> {{ i?.goodsResource?.receiptUserId }} / {{ i?.supplementaryInformationVO?.phon }} </sv>
<sv label="所在地区">
{{i?.goodsResource?.receiptAddress}}
{{ i?.goodsResource?.receiptAddress }}
</sv>
<sv label="详细地址">
{{i?.goodsResource?.receiptAddress}}
{{ i?.goodsResource?.receiptAddress }}
</sv>
</sv-container>
<sv-container col="1" class="mt-md">
<sv label="回单凭证">
<nz-upload
class="avatar-uploader"
[nzAction]="service.$api_upload_url"
[nzName]="'multipartFile'"
nzListType="picture-card"
[(nzFileList)]="listImagUrls"
[nzShowButton]="listImagUrls.length < 5"
[nzPreview]="handlePreview1"
[nzBeforeUpload]="beforeUpload"
(nzChange)="handleChange1($event)"
>
<div>
<i nz-icon nzType="plus"></i>
<div style="margin-top: 8px">请上传图片</div>
</div>
</nz-upload>
<nz-modal [nzVisible]="previewVisible1" [nzContent]="modalContent" [nzFooter]="null" (nzOnCancel)="previewVisible1 = false">
<ng-template #modalContent>
<img [src]="previewImage1" [ngStyle]="{ width: '100%' }" />
</ng-template>
</nz-modal>
class="avatar-uploader"
[nzAction]="service.$api_upload_url"
[nzName]="'multipartFile'"
nzListType="picture-card"
[(nzFileList)]="listImagUrls"
[nzShowButton]="listImagUrls.length < 5"
[nzPreview]="handlePreview1"
[nzBeforeUpload]="beforeUpload"
(nzChange)="handleChange1($event)"
>
<div>
<i nz-icon nzType="plus"></i>
<div style="margin-top: 8px">请上传图片</div>
</div>
</nz-upload>
<nz-modal [nzVisible]="previewVisible1" [nzContent]="modalContent" [nzFooter]="null" (nzOnCancel)="previewVisible1 = false">
<ng-template #modalContent>
<img [src]="previewImage1" [ngStyle]="{ width: '100%' }" />
</ng-template>
</nz-modal>
</sv>
<sv label="备注">
{{i?.goodsResource?.remarks}}
{{ i?.goodsResource?.remarks }}
</sv>
</sv-container>
</nz-card>
<nz-card>
<div nz-row>
<nz-card nzTitle="轨迹信息" style="width: 100%;" #distannce5>
<div nz-row >
<div nz-col [nzSpan]='12'>
<!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<nz-card nzTitle="轨迹信息" style="width: 100%" #distannce5>
<div nz-row>
<div nz-col [nzSpan]="12">
<!-- <st #st [data]="i?.auditRecordList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
</st> -->
</div>
<div nz-col [nzSpan]='12'>
<amap-path-simplifier></amap-path-simplifier>
</div>
</div>
</div>
<div nz-col [nzSpan]="12">
<amap-path-simplifier></amap-path-simplifier>
</div>
</div>
</nz-card>
</div>
</nz-card>
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
<nz-modal [(nzVisible)]="isVisible" [nzFooter]="nzModalFooter" nzTitle="附件信息" (nzOnOk)="handleOK()" (nzOnCancel)="handleCancel()">
<ng-container *nzModalContent>
<app-imagelist [imgList]="imges"></app-imagelist>
</ng-container>
<ng-template #nzModalFooter>
<button nz-button nzType="primary" (click)="handleOK()" [disabled]="">取消</button>
<button nz-button nzType="default" (click)="handleCancel()">确定 </button>
<button nz-button nzType="default" (click)="handleCancel()">确定 </button>
</ng-template>
</nz-modal>
</nz-modal>

880
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

File diff suppressed because it is too large Load Diff

14
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-18 14:41: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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:19:41
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<page-header-wrapper [title]="''" [logo]="logo" [content]="headerContent">
<ng-template #logo>

16
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts
View File

@ -1,16 +1,16 @@
import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-18 14:41:28
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-28 14:42:03
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzCardComponent } from 'ng-zorro-antd/card';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalService } from 'ng-zorro-antd/modal';

14
src/app/routes/order-management/components/vehicle/vehicle.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-18 14:38:28
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:12:59
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle\\vehicle.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">

15
src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-12 14:01: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\order-management\modal\bulk\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 15:02:52
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:49
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert
style="padding-bottom: 15px;"
nzType="warning"

105
src/app/routes/order-management/modal/bulk/confir-receipt/confir-receipt.component.ts
View File

@ -1,29 +1,20 @@
import { preloaderFinished } from '@delon/theme';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-18 16:34:59
* @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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 15:02:52
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:20:58
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\confir-receipt\\confir-receipt.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { Component, OnInit } from '@angular/core';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload';
import { Observable, Observer } from 'rxjs';
import { OrderManagementService } from '../../../services/order-management.service';
function getBase64(file: File): Promise<string | ArrayBuffer | null> {
return new Promise((resolve, reject) => {
const reader = new FileReader();
@ -38,9 +29,9 @@ function getBase64(file: File): Promise<string | ArrayBuffer | null> {
styleUrls: ['./confir-receipt.component.less']
})
export class ConfirReceiptComponent implements OnInit {
i:any;
Status:any;
detailList:any;
i: any;
Status: any;
detailList: any;
data: any = {};
driverList: any;
payeeList: any;
@ -48,63 +39,63 @@ export class ConfirReceiptComponent implements OnInit {
listImagUrls: any[] = [];
previewImage1 = '';
previewVisible1 = false;
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient, public service: OrderManagementService) {}
constructor(
private modal: NzModalRef,
private msgSrv: NzMessageService,
public http: _HttpClient,
public service: OrderManagementService
) {}
ngOnInit(): void {
this.initData()
this.initData();
}
save(): void {
// 大宗
console.log(this.listImagUrls)
let imgList : any= [];
if(this.listImagUrls.length > 0) {
this.listImagUrls.forEach((res :any) => {
if(res.url) {
imgList.push(res.url)
console.log(this.listImagUrls);
let imgList: any = [];
if (this.listImagUrls.length > 0) {
this.listImagUrls.forEach((res: any) => {
if (res.url) {
imgList.push(res.url);
}
})
});
}
console.log(imgList)
console.log(imgList);
const params = {
id: this.i?.id,
filePathList: imgList,
}
console.log(params)
filePathList: imgList
};
console.log(params);
this.service.request(this.service.$api_get_signBulkOrder, params).subscribe((res: any) => {
console.log(res.success)
if(res) {
this.service.msgSrv.success('确认签收成功！')
console.log(res.success);
if (res) {
this.service.msgSrv.success('确认签收成功！');
this.modal.destroy(true);
}
})
});
}
initData() {
// 大宗
this.service.request(this.service.$api_get_getBulkSignForDetail, {id: this.i?.id}).subscribe((res: any) => {
console.log(res)
this.detailList = res;
let arr : any= []
res.filePathList.forEach((element: any, index: any) => {
console.log(index)
arr.push( {
this.service.request(this.service.$api_get_getBulkSignForDetail, { id: this.i?.id }).subscribe((res: any) => {
console.log(res);
this.detailList = res;
let arr: any = [];
res.filePathList.forEach((element: any, index: any) => {
console.log(index);
arr.push({
url: element,
status: 'done',
uid: index
})
});
this.listImagUrls = arr;
})
});
this.listImagUrls = arr;
});
}
close(): void {
this.modal.destroy(true);
}
userAction() {
}
userAction() {}
handlePreview1 = async (file: NzUploadFile) => {
if (!file.url && !file.preview) {
file.preview = await getBase64(file.originFileObj!);
@ -119,14 +110,14 @@ export class ConfirReceiptComponent implements OnInit {
case 'done':
let fileList = [...info.fileList];
// 2. Read from response and show file link
console.log(fileList)
console.log(fileList);
fileList = fileList.map((file: any) => {
if (file.response) {
file.url = file.response.data.fullFilePath;
}
return file;
});
console.log(this.listImagUrls)
console.log(this.listImagUrls);
break;
case 'error':
this.service.msgSrv.error('网络错误');

18
src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.html
View File

@ -1,20 +1,22 @@
<!--
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-17 17:02:31
* @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\modal\bulk\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 14:03:07
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:21:21
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 90, grid: { span: 24 } } }" [button]="'none'"> </sf>
<nz-divider style="margin-top: 0"></nz-divider>
<div>
<p style="font-size: 16px">
<span style="font-weight: bolder"
>总运费：<span style="color: #dc112a">{{ data.totalFreight |currency }}</span></span
>总运费：<span style="color: #dc112a">{{ data.totalFreight | currency }}</span></span
>
</p>
<p style="margin-bottom: 0"> 运输费：{{ data.freight |currency }}，附加费：{{ data.surcharge |currency}}</p>
<p style="margin-bottom: 0"> 运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency }}</p>
</div>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>

46
src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts
View File

@ -1,17 +1,15 @@
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-17 17:02:25
* @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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-14 14:03:07
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:21:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import {
SFComponent, SFNumberWidgetSchema, SFSchema,
SFSelectWidgetSchema,
SFStringWidgetSchema, SFTextWidgetSchema
} from '@delon/form';
import { SFComponent, SFNumberWidgetSchema, SFSchema, SFSelectWidgetSchema, SFStringWidgetSchema, SFTextWidgetSchema } from '@delon/form';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { Subscription } from 'rxjs';
import { OrderManagementService } from '../../../services/order-management.service';
@ -29,7 +27,7 @@ export class UpdateFreightComponent implements OnInit {
data: any;
calculateSub!: Subscription;
constructor(private service: OrderManagementService,private modal: NzModalRef, ) {}
constructor(private service: OrderManagementService, private modal: NzModalRef) {}
ngOnInit(): void {
this.schema = this.initSF(this.data);
@ -47,8 +45,8 @@ export class UpdateFreightComponent implements OnInit {
freightPrice: {
type: 'number',
title: '运费单价',
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
ui: {
addOnAfter: data.freightTypeLabel,
placeholder: '请输入',
@ -107,8 +105,8 @@ export class UpdateFreightComponent implements OnInit {
type: 'number',
title: '装货重量',
default: data.acceptWeight,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -123,8 +121,8 @@ export class UpdateFreightComponent implements OnInit {
type: 'number',
title: '装货体积',
default: data.acceptVolume,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -139,8 +137,8 @@ export class UpdateFreightComponent implements OnInit {
type: 'number',
title: '卸货重量',
default: data.settlementWeight,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -155,8 +153,8 @@ export class UpdateFreightComponent implements OnInit {
type: 'number',
title: '卸货体积',
default: data.settlementVolume,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -207,10 +205,10 @@ export class UpdateFreightComponent implements OnInit {
}
save(value: any): void {
if(!this.sf.valid){
if (!this.sf.valid) {
this.sf.validator({ emitError: true });
return;
}
}
this.service.request(this.service.$api_change_bulk, { billId: this.data.billId, ...this.sf.value }).subscribe(res => {
if (res) {
this.service.msgSrv.success('变更运费成功');

25
src/app/routes/order-management/modal/vehicle/cancel/cancel.component.ts
View File

@ -1,27 +1,22 @@
/*
* @Author: your name
* @Date: 2021-12-21 10:14:52
* @LastEditTime: 2022-01-18 16:35:03
* @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\modal\vehicle\cancel\cancel.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-21 10:14:52
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:21:43
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\cancel\\cancel.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFComponent, SFSchema,
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
@Component({
selector: 'app-order-management-cancel',
templateUrl: './cancel.component.html'
@ -36,7 +31,7 @@ export class OneCarOrderCancelComponent implements OnInit {
ngOnInit(): void {
this.initSF();
console.log(this.i.billStatusLabel)
console.log(this.i.billStatusLabel);
}
initSF() {
this.schema = {

18
src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.html
View File

@ -1,10 +1,12 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-12 14:04:38
* @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\modal\vehicle\confir-receipt\confir-receipt.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:21:57
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert
style="padding-bottom: 15px"
@ -18,10 +20,10 @@
<st #st [widthMode]="{ type: 'strict' }" [data]="costDetail" [columns]="columns" bordered="true" [page]="{ show: false }"></st>
</sv>
<sv label="司机车辆">
<div>{{dataInfo?.driverName}} / {{dataInfo?.driverPhone}}/ {{dataInfo?.carNo}}</div>
<div>{{ dataInfo?.driverName }} / {{ dataInfo?.driverPhone }}/ {{ dataInfo?.carNo }}</div>
</sv>
<sv label="收款人">
<div>{{dataInfo?.payeeName}} / {{dataInfo?.payeePhone}}</div>
<div>{{ dataInfo?.payeeName }} / {{ dataInfo?.payeePhone }}</div>
</sv>
<sv label="回单凭证">
<nz-upload

137
src/app/routes/order-management/modal/vehicle/confir-receipt/confir-receipt.component.ts
View File

@ -1,30 +1,21 @@
/*
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-18 16:35:11
* @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\modal\vehicle\confir-receipt\confir-receipt.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:22:10
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\confir-receipt\\confir-receipt.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, OnInit, ViewChild } from '@angular/core';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload';
import { Component, OnInit } from '@angular/core';
import { STColumn } from '@delon/abc/st';
import { _HttpClient } from '@delon/theme';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
import { NzUploadChangeParam, NzUploadFile } from 'ng-zorro-antd/upload';
import { Observable, Observer } from 'rxjs';
import { STColumn } from '@delon/abc/st';
import { OrderManagementService } from '../../../services/order-management.service';
function getBase64(file: File): Promise<string | ArrayBuffer | null> {
return new Promise((resolve, reject) => {
const reader = new FileReader();
@ -40,47 +31,52 @@ function getBase64(file: File): Promise<string | ArrayBuffer | null> {
})
export class VehicleConfirReceiptComponent implements OnInit {
record: any = {};
i:any;
Status: any
costDetail: any // 费用明细
i: any;
Status: any;
costDetail: any; // 费用明细
columns!: STColumn[];
previewVisible1 = false;
dataInfo: any;
detailList: any
detailList: any;
data: any = {};
previewImage1 = '';
listImagUrls: any[] = [];
payeeList: any;
driverList: any;
carList: any;
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public http: _HttpClient,public service: OrderManagementService) {}
constructor(
private modal: NzModalRef,
private msgSrv: NzMessageService,
public http: _HttpClient,
public service: OrderManagementService
) {}
ngOnInit(): void {
this.initST()
this.initData()
this.initST();
this.initData();
}
save(): void {
let imgList : any= [];
if(this.listImagUrls.length > 0) {
this.listImagUrls.forEach((res :any) => {
if(res.url) {
imgList.push(res.url)
let imgList: any = [];
if (this.listImagUrls.length > 0) {
this.listImagUrls.forEach((res: any) => {
if (res.url) {
imgList.push(res.url);
}
})
});
}
console.log(imgList)
console.log(imgList);
const params = {
id: this.i?.id,
filePathList: imgList,
}
filePathList: imgList
};
this.service.request(this.service.$api_get_signWholeOrder, params).subscribe((res: any) => {
console.log(res)
if(res) {
this.service.msgSrv.success('确认签收成功！')
console.log(res);
if (res) {
this.service.msgSrv.success('确认签收成功！');
this.modal.destroy();
}
})
});
}
handlePreview1 = async (file: NzUploadFile) => {
if (!file.url && !file.preview) {
@ -92,7 +88,7 @@ export class VehicleConfirReceiptComponent implements OnInit {
close(): void {
this.modal.destroy();
}
beforeUpload = (file: NzUploadFile, _fileList: NzUploadFile[]) => {
return new Observable((observer: Observer<boolean>) => {
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/gif' || file.type === 'image/bmp';
@ -114,35 +110,35 @@ export class VehicleConfirReceiptComponent implements OnInit {
};
initData() {
// 大宗
this.service.request(this.service.$api_get_getWholeSignForDetail, {id: this.i?.id}).subscribe((res: any) => {
console.log(res)
this.dataInfo = res;
const cost: any = {}
res.mybidDetailInfo.forEach((element: any) => {
if(element.expenseName === "预付" || element.expenseCode === 'PRE') {
cost.PRE = element.price
} else if(element.expenseName === "到付" || element.expenseCode === 'RECE') {
cost.RECE = element.price
} else if(element.expenseName === "回单付" || element.expenseCode === 'BACK') {
cost.BACK = element.price
} else if(element.expenseName === "油卡" || element.expenseCode === 'OIL') {
cost.OIL = element.price
} else if(element.expenseName === "总费用") {
cost.traiPrice = element.price
}
});
let arr : any= []
res.filePathList.forEach((element: any, index: any) => {
console.log(index)
arr.push( {
this.service.request(this.service.$api_get_getWholeSignForDetail, { id: this.i?.id }).subscribe((res: any) => {
console.log(res);
this.dataInfo = res;
const cost: any = {};
res.mybidDetailInfo.forEach((element: any) => {
if (element.expenseName === '预付' || element.expenseCode === 'PRE') {
cost.PRE = element.price;
} else if (element.expenseName === '到付' || element.expenseCode === 'RECE') {
cost.RECE = element.price;
} else if (element.expenseName === '回单付' || element.expenseCode === 'BACK') {
cost.BACK = element.price;
} else if (element.expenseName === '油卡' || element.expenseCode === 'OIL') {
cost.OIL = element.price;
} else if (element.expenseName === '总费用') {
cost.traiPrice = element.price;
}
});
let arr: any = [];
res.filePathList.forEach((element: any, index: any) => {
console.log(index);
arr.push({
url: element,
status: 'done',
uid: index
})
});
this.listImagUrls = arr;
this.costDetail = [cost];
})
});
this.listImagUrls = arr;
this.costDetail = [cost];
});
}
initST() {
@ -169,7 +165,7 @@ export class VehicleConfirReceiptComponent implements OnInit {
}
];
}
handleChange1(info: NzUploadChangeParam): void {
switch (info.file.status) {
case 'uploading':
@ -177,19 +173,18 @@ export class VehicleConfirReceiptComponent implements OnInit {
case 'done':
let fileList = [...info.fileList];
// 2. Read from response and show file link
console.log(fileList)
console.log(fileList);
fileList = fileList.map((file: any) => {
if (file.response) {
file.url = file.response.data.fullFilePath;
}
return file;
});
console.log(this.listImagUrls)
console.log(this.listImagUrls);
break;
case 'error':
this.service.msgSrv.error('网络错误');
break;
}
}
}

16
src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.html
View File

@ -1,13 +1,15 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2021-12-29 20:23:18
* @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\modal\vehicle\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-29 16:48:16
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:22:24
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\freight-people\\freight-people.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '已选择条订单'" nzShowIcon></nz-alert>
<sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf?.value)" [disabled]="sf?.valid">确定</button>

41
src/app/routes/order-management/modal/vehicle/freight-people/freight-people.component.ts
View File

@ -1,19 +1,19 @@
import { Params } from '@angular/router';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-17 16:20:06
* @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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-29 16:48:16
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:22:37
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\freight-people\\freight-people.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import {SFComponent, SFNumberWidgetSchema, SFSchema, SFUISchema} from '@delon/form';
import { Component, OnInit, ViewChild } from '@angular/core';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { ShipperBaseService } from '@shared';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
import { ShipperBaseService } from '@shared';
@Component({
selector: 'app-order-management-vehicle-freight-people',
@ -33,11 +33,11 @@ export class VehicleFreightPeopleComponent implements OnInit {
private modal: NzModalRef,
private msgSrv: NzMessageService,
public service: OrderManagementService,
public shipperservice: ShipperBaseService,
) {}
public shipperservice: ShipperBaseService
) {}
ngOnInit(): void {
console.log(this.data)
console.log(this.data);
this.initSF();
}
initSF() {
@ -50,12 +50,12 @@ export class VehicleFreightPeopleComponent implements OnInit {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
_$expand: (value: boolean) => value
},
allowClear: true,
asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
},
},
asyncData: () => this.shipperservice.getNetworkFreightForwarder()
}
}
},
required: ['enterpriseInfoName']
};
@ -68,12 +68,12 @@ export class VehicleFreightPeopleComponent implements OnInit {
}
save(value: any): void {
console.log(this.sf.value)
console.log(this.sf.value);
const params = {
billIds: this.data?.ids,
enterpriseInfoId: this.sf.value?.enterpriseInfoName
};
console.log(params)
console.log(params);
this.service.request(this.service.$api_set_updateEnterpriseInfoBatch, params).subscribe((res: any) => {
if (res) {
this.modal.destroy();
@ -85,5 +85,4 @@ export class VehicleFreightPeopleComponent implements OnInit {
close(): void {
this.modal.destroy();
}
}

55
src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.html
View File

@ -1,45 +1,38 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-05 16:38:21
* @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\modal\vehicle\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-29 17:27:37
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:22:55
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '条订单,未认证司机不可设置为车队长，合同单车队长需绑定收款账户！'" nzShowIcon></nz-alert>
<nz-alert
nzType="info"
[nzMessage]="'已选择' + data?.ids?.length + '条订单,未认证司机不可设置为车队长，合同单车队长需绑定收款账户！'"
nzShowIcon
></nz-alert>
<div nz-row>
<div nz-col [nzSpan]="16">
<sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" button='none'>
</sf>
</div>
<div nz-col [nzSpan]="1" style="margin-top: 15px;" >
<button style="display: inline-block;" nz-button nzType="primary" (click)="initDate()">搜索</button>
<sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"> </sf>
</div>
<div nz-col [nzSpan]="1" style="margin-top: 15px">
<button style="display: inline-block" nz-button nzType="primary" (click)="initDate()">搜索</button>
</div>
</div>
<st #st
[data]="dataList"
[columns]="Columns"
[loadingDelay]="500"
>
<st #st [data]="dataList" [columns]="Columns" [loadingDelay]="500">
<ng-template st-row="avatar" let-item let-index="index">
<img style="height: 20px;" [src]="item?.avatar" alt="">
<img style="height: 20px" [src]="item?.avatar" alt="" />
</ng-template>
<ng-template st-row="bankList" let-item let-index="index">
<nz-select [(ngModel)]="bankData" style="width: 200px;">
<nz-option
*ngFor="let i of item.bankList"
[nzLabel]="i.bankCardNumber"
[nzValue]="i.id"
></nz-option>
<nz-select [(ngModel)]="bankData" style="width: 200px">
<nz-option *ngFor="let i of item.bankList" [nzLabel]="i.bankCardNumber" [nzValue]="i.id"></nz-option>
</nz-select>
</ng-template>
<ng-template st-row="paymentMethodRate" let-item let-index="index">
<input nz-input [ngModel]="item?.paymentMethodRate" (ngModelChange)="st.setRow(index, { paymentMethodRate: $event })" />
<input nz-input [ngModel]="item?.paymentMethodRate" (ngModelChange)="st.setRow(index, { paymentMethodRate: $event })" />
</ng-template>
</st>
<!-- <div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [disabled]="sf.valid">确定</button>
</div> -->
</st>

65
src/app/routes/order-management/modal/vehicle/modify-captain/modify-captain.component.ts
View File

@ -1,14 +1,16 @@
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-05 16:27:22
* @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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-30 14:45:39
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:23:11
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-captain\\modify-captain.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import { Component, OnInit, ViewChild } from '@angular/core';
import { STColumn, STComponent } from '@delon/abc/st';
import {SFComponent, SFNumberWidgetSchema, SFSchema, SFUISchema} from '@delon/form';
import { SFComponent, SFSchema, SFUISchema } from '@delon/form';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
@ -23,16 +25,16 @@ export class VehicleModifyCaptainComponent implements OnInit {
@ViewChild('st', { static: false }) st!: STComponent;
schema: SFSchema = {};
ui: SFUISchema = {};
Columns: STColumn[] =[]
Columns: STColumn[] = [];
aggreechecked = false;
dataList: any =[]
dataList: any = [];
data: any;
bankData: any;
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService, ) {}
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {}
ngOnInit(): void {
console.log(this.data)
console.log(this.data);
this.initSF();
this.initST();
}
@ -43,7 +45,7 @@ export class VehicleModifyCaptainComponent implements OnInit {
type: 'string',
title: '车队长手机号',
maxLength: 11
},
}
},
required: ['mobile']
};
@ -56,9 +58,9 @@ export class VehicleModifyCaptainComponent implements OnInit {
}
initST() {
this.Columns = [
{ title: '司机头像', render: 'avatar',width: '120px', },
{ title: '司机姓名', index: 'name' ,width: '120px',},
{
{ title: '司机头像', render: 'avatar', width: '120px' },
{ title: '司机姓名', index: 'name', width: '120px' },
{
title: '实名认证状态',
className: 'text-center',
index: 'certificationStatus',
@ -68,11 +70,11 @@ export class VehicleModifyCaptainComponent implements OnInit {
'-1': { text: '未提交', color: 'warning' },
'0': { text: '待审核', color: 'warning' },
'1': { text: '通过', color: 'success' },
'2': { text: '驳回', color: 'error' },
},
'2': { text: '驳回', color: 'error' }
}
},
{ title: '收款账户',width: '200px', render: 'bankList' },
{
{ title: '收款账户', width: '200px', render: 'bankList' },
{
title: '操作',
width: '120px',
className: 'text-center',
@ -80,19 +82,18 @@ export class VehicleModifyCaptainComponent implements OnInit {
{
text: '设置',
click: item => {
this.set(item)
this.set(item);
}
}
]
}
];
}
set(value: any): void {
console.log(this.st?._data)
console.log(this.data)
console.log(value)
console.log(this.bankData)
];
}
set(value: any): void {
console.log(this.st?._data);
console.log(this.data);
console.log(value);
console.log(this.bankData);
const params = {
billIds: this.data?.ids,
carCaptainId: value.id,
@ -110,12 +111,12 @@ export class VehicleModifyCaptainComponent implements OnInit {
initDate() {
const params = {
fetchBank: 1,
...this.sf?.value,
...this.sf?.value
};
this.service.request(this.service.$api_get_getCarCaptainByMobile, params).subscribe((res: any) => {
console.log(res)
console.log(res);
if (res) {
this.dataList = [res]
this.dataList = [res];
}
});
}

18
src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.html
View File

@ -1,14 +1,16 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-04 11:10:46
* @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\modal\vehicle\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-29 14:51:07
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:23:25
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<nz-alert nzType="info" [nzMessage]="'已选择' + data?.ids?.length + '已选择条订单'" nzShowIcon></nz-alert>
<sf style="margin-top: 15px;" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<sf style="margin-top: 15px" #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" >确定</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)">确定</button>
</div>

46
src/app/routes/order-management/modal/vehicle/modify-rate/modify-rate.component.ts
View File

@ -1,24 +1,16 @@
import { preloaderFinished } from '@delon/theme';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-04 11: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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-29 14:51:07
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:23:46
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\modify-rate\\modify-rate.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { SFComponent, SFNumberWidgetSchema, SFSchema, SFUISchema } from '@delon/form';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
@ -41,7 +33,7 @@ export class VehicleModifyRateComponent implements OnInit {
constructor(private modal: NzModalRef, private msgSrv: NzMessageService, public service: OrderManagementService) {}
ngOnInit(): void {
console.log(this.data)
console.log(this.data);
this.initSF();
}
initSF() {
@ -53,9 +45,9 @@ export class VehicleModifyRateComponent implements OnInit {
ui: {
unit: '%',
widgetWidth: 200,
precision: 2,
precision: 2
} as SFNumberWidgetSchema
},
}
},
required: ['additionalRate']
};
@ -68,23 +60,22 @@ export class VehicleModifyRateComponent implements OnInit {
}
save(value: any): void {
if(!this.sf.value?.additionalRate) {
this.service.msgSrv.warning('请填写附加费！')
if (!this.sf.value?.additionalRate) {
this.service.msgSrv.warning('请填写附加费！');
return;
}
console.log(this.sf.value)
console.log(this.sf.value);
const params = {
ids: this.data?.ids,
...this.sf.value
};
console.log(params)
console.log(params);
this.service.request(this.service.$api_set_updateAdditionalRateBatch, params).subscribe((res: any) => {
if (res) {
this.modal.close(true);
this.service.msgSrv.success('变更运费成功');
} else {
this.service.msgSrv.error(res?.msg)
this.service.msgSrv.error(res?.msg);
}
});
}
@ -92,5 +83,4 @@ export class VehicleModifyRateComponent implements OnInit {
close(): void {
this.modal.destroy();
}
}

35
src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.html
View File

@ -1,29 +1,30 @@
<!--
* @Author: your name
* @Date: 2021-12-14 15:53:03
* @LastEditTime: 2021-12-20 19:53:23
* @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\modal\bulk\sure-depart\sure-depart.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:23:52
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\sure-arrive\\sure-arrive.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="formData" button="none">
<ng-template sf-template="weight" let-me let-ui="ui" let-schema="schema">
<div style="display: flex;">
<nz-input-number [(ngModel)]="data.weight" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
<div class="left_btn">吨</div>
<div style="display: flex">
<nz-input-number [(ngModel)]="data.weight" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
<div class="left_btn">吨</div>
</div>
</ng-template>
</ng-template>
<ng-template sf-template="volume" let-me let-ui="ui" let-schema="schema">
<div style="display: flex;">
<nz-input-number [(ngModel)]="data.volume" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
<div class="left_btn">方</div>
<div style="display: flex">
<nz-input-number [(ngModel)]="data.volume" [nzMin]="1" [nzMax]="10" [nzStep]="1"></nz-input-number>
<div class="left_btn">方</div>
</div>
</ng-template>
</ng-template>
</sf>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading"
>确认到车</button
>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading">确认到车</button>
</div>

35
src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html
View File

@ -1,29 +1,30 @@
<!--
* @Author: your name
* @Date: 2021-12-14 15:53:03
* @LastEditTime: 2021-12-21 18:55:37
* @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\modal\bulk\sure-depart\sure-depart.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:01
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\sure-depart\\sure-depart.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<sf #sf mode="edit" [schema]="schema" [ui]="ui" [formData]="i" button="none">
<ng-template sf-template="weight" let-me let-ui="ui" let-schema="schema">
<div style="display: flex;">
<nz-input-number [(ngModel)]="data.weight" [nzMin]="1" [nzMax]="999999" [nzStep]="1"></nz-input-number>
<div class="left_btn">吨</div>
<div style="display: flex">
<nz-input-number [(ngModel)]="data.weight" [nzMin]="1" [nzMax]="999999" [nzStep]="1"></nz-input-number>
<div class="left_btn">吨</div>
</div>
</ng-template>
</ng-template>
<ng-template sf-template="volume" let-me let-ui="ui" let-schema="schema">
<div style="display: flex;">
<nz-input-number [(ngModel)]="data.volume" [nzMin]="1" [nzMax]="999999" [nzStep]="1"></nz-input-number>
<div class="left_btn">方</div>
<div style="display: flex">
<nz-input-number [(ngModel)]="data.volume" [nzMin]="1" [nzMax]="999999" [nzStep]="1"></nz-input-number>
<div class="left_btn">方</div>
</div>
</ng-template>
</ng-template>
</sf>
<div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading"
>确认发车</button
>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading">确认发车</button>
</div>

17
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.html
View File

@ -1,11 +1,14 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-17 14:52:34
* @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\modal\vehicle\update-freight\update-freight.component.html
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:08
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<sf #sf mode="edit" [schema]="schema" [ui]="ui" button="none"></sf>
<nz-divider></nz-divider>
<div>
@ -13,7 +16,7 @@
<span style="font-weight: bolder"
>总运费：<span style="color: #dc112a">{{ data.totalFreight | currency }}</span></span
>
（运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency}}）
（运输费：{{ data.freight | currency }}，附加费：{{ data.surcharge | currency }}）
</p>
<p>
<label nz-checkbox [(ngModel)]="aggreechecked">确认已阅读并知晓<a>《变更协议》</a></label>

45
src/app/routes/order-management/modal/vehicle/update-freight/update-freight.component.ts
View File

@ -1,28 +1,19 @@
import { preloaderFinished } from '@delon/theme';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-13 15:26:14
* @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\modal\bulk\update-freight\update-freight.component.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:18
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\update-freight\\update-freight.component.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Component, Input, OnInit, ViewChild } from '@angular/core';
import {
SFComponent,
SFCustomWidgetSchema,
SFNumberWidgetSchema,
SFRadioWidgetSchema,
SFSchema,
SFSelectWidgetSchema,
SFTextareaWidgetSchema,
SFUISchema
} from '@delon/form';
import { _HttpClient } from '@delon/theme';
import { SFComponent, SFNumberWidgetSchema, SFSchema, SFTextareaWidgetSchema, SFUISchema } from '@delon/form';
import { NzMessageService } from 'ng-zorro-antd/message';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { OrderManagementService } from '../../../services/order-management.service';
import { Subscription } from 'rxjs';
import { OrderManagementService } from '../../../services/order-management.service';
@Component({
selector: 'app-order-management-vehicle-update-freight',
@ -58,8 +49,8 @@ export class VehicleUpdateFreightComponent implements OnInit {
type: 'number',
title: '预付',
default: info.prePay?.price || 0,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
readOnly: info.prePay?.paymentStatus === '2' || info.prePay?.paymentStatus === '4',
ui: {
prefix: '￥',
@ -72,8 +63,8 @@ export class VehicleUpdateFreightComponent implements OnInit {
type: 'number',
title: '到付',
default: info.toPay?.price || 0,
minimum:0,
maximum:99999,
minimum: 0,
maximum: 99999,
readOnly: info.toPay?.paymentStatus === '2' || info.toPay?.paymentStatus === '4',
ui: {
prefix: '￥',
@ -86,7 +77,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
// type: 'number',
// title: '油卡',
// default: 0.0,
// minimum:0,
// minimum:0,
// readOnly: this.i.oilCardPayStatus === '1' || this.i.oilCardPayStatus === '3',
// ui: {
// prefix: '￥',
@ -98,9 +89,9 @@ export class VehicleUpdateFreightComponent implements OnInit {
receiptPay: {
type: 'number',
title: '回单付',
maximum:99999,
maximum: 99999,
default: info.receiptPay?.price || 0,
minimum:0,
minimum: 0,
readOnly: info.receiptPay?.paymentStatus === '2' || info.receiptPay?.paymentStatus === '4',
ui: {
prefix: '￥',
@ -130,7 +121,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
}
save(value: any): void {
if(!this.sf.valid) {
if (!this.sf.valid) {
this.service.msgSrv.error('请填写必填项！');
return;
}

14
src/app/routes/order-management/order-management-routing.module.ts
View File

@ -1,10 +1,12 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-04 17:31:44
* @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
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-06 09:24:00
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:33
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management-routing.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';

15
src/app/routes/order-management/order-management.module.ts
View File

@ -1,11 +1,14 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-04 17:31:58
* @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.module.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2022-01-06 09:24:00
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:17:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\order-management.module.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { NgModule, Type } from '@angular/core';
import { SharedModule } from '@shared';
import { OrderManagementBulkDetailChangeComponent } from './components/bulk-detail-change/bulk-detail-change.component';

157
src/app/routes/order-management/services/order-management.service.ts
View File

@ -1,29 +1,31 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 14:08:57
* @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\services\order-management.service.ts
* @Description :
* @Version : 1.0
* @Author : Shiming
* @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming
* @LastEditTime : 2022-01-18 17:24:32
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
import { Injectable, Injector } from '@angular/core';
import { map } from 'rxjs/operators';
import { EACacheService, ShipperBaseService } from '@shared';
import { map } from 'rxjs/operators';
@Injectable({
providedIn: 'root'
})
export class OrderManagementService extends ShipperBaseService {
$api_get_getEnterpriseNetTransHis = `/api/mdc/enterpriseNetTransHis/getEnterpriseNetTransHis`;
$api_get_catalogue_member = `/user?_allow_anonymous=true`;
$api_get_bulkPage_list = `/api/sdc/goodsResourceOperate/listBulkPage`;
// 据 手机号/姓名 查询 车队长/司机
$api_get_getDriverInfo = `/api/mdc/cuc/user/getDriverInfo`;
$api_del_driver = ``;
// 获取货主企业列表
// 获取货主企业列表
public $api_getList = '/api/mdc/cuc/enterpriseInfo/cargoOwner/getList?_allow_anonymous=true';
// 风险单：
// 风险单：
// 风险单列表查询
$api_get_listRiskPage = `/api/sdc/billRiskOperate/listRiskPage`;
// 风险单列表查询
@ -36,35 +38,35 @@ export class OrderManagementService extends ShipperBaseService {
$api_get_listWholePage = `/api/sdc/billOperate/listWholePage`;
// 整车详情
$api_get_getWholeBillDetail = `/api/sdc/billOperate/getWholeBillDetail`;
// 根据车牌号查询车辆信息
$api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`;
// 根据车牌号查询车辆信息
$api_get_getCarLicenseListByCarNo = `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`;
// 查询大宗订单列表
$api_get_listBulkPage = `/api/sdc/billOperate/listBulkPage`;
// 查看运费变更记录详情-整车
$api_get_getChangeRecordWholeDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordWholeDetail`;
// 根据订单ID查看运费变更申请记录
$api_get_listChangeApply = `/api/sdc/billFreightChangeApplication/listChangeApply`;
// 变更运费页面-整车-整车
$api_get_getFreightChangeWholeDetail = `/api/sdc/billFreightChangeApplication/getFreightChangeWholeDetail`;
// 订单申请撤销
$api_get_revokeChangeRecord = `/api/sdc/billFreightChangeApplication/revokeChangeRecord`;
// 运费变更申请-整车
$api_get_insertFreightChangeWhole = `/api/sdc/billFreightChangeApplication/insertFreightChangeWhole`;
// 取消订单
$api_get_cancelAnOrder = `/api/sdc/billOperate/cancelAnOrder`;
// 批量签收整车订单
$api_get_batchSignWholeOrder = `/api/sdc/billOperate/batchSignWholeOrder`;
// 批量签收大宗订单
$api_get_batchSignBulkOrder = `/api/sdc/billOperate/batchSignBulkOrder`;
// 大宗签收详情
$api_get_getBulkSignForDetail = `/api/sdc/billOperate/getBulkSignForDetail`;
// 整车签收详情
$api_get_getWholeSignForDetail = `/api/sdc/billOperate/getWholeSignForDetail`;
// 确认签收大宗订单
$api_get_signBulkOrder = `/api/sdc/billOperate/signBulkOrder`;
// 确认签收整车订单
$api_get_signWholeOrder = `/api/sdc/billOperate/signWholeOrder`;
// 查询大宗订单列表
$api_get_listBulkPage = `/api/sdc/billOperate/listBulkPage`;
// 查看运费变更记录详情-整车
$api_get_getChangeRecordWholeDetail = `/api/sdc/billFreightChangeRecord/getChangeRecordWholeDetail`;
// 根据订单ID查看运费变更申请记录
$api_get_listChangeApply = `/api/sdc/billFreightChangeApplication/listChangeApply`;
// 变更运费页面-整车-整车
$api_get_getFreightChangeWholeDetail = `/api/sdc/billFreightChangeApplication/getFreightChangeWholeDetail`;
// 订单申请撤销
$api_get_revokeChangeRecord = `/api/sdc/billFreightChangeApplication/revokeChangeRecord`;
// 运费变更申请-整车
$api_get_insertFreightChangeWhole = `/api/sdc/billFreightChangeApplication/insertFreightChangeWhole`;
// 取消订单
$api_get_cancelAnOrder = `/api/sdc/billOperate/cancelAnOrder`;
// 批量签收整车订单
$api_get_batchSignWholeOrder = `/api/sdc/billOperate/batchSignWholeOrder`;
// 批量签收大宗订单
$api_get_batchSignBulkOrder = `/api/sdc/billOperate/batchSignBulkOrder`;
// 大宗签收详情
$api_get_getBulkSignForDetail = `/api/sdc/billOperate/getBulkSignForDetail`;
// 整车签收详情
$api_get_getWholeSignForDetail = `/api/sdc/billOperate/getWholeSignForDetail`;
// 确认签收大宗订单
$api_get_signBulkOrder = `/api/sdc/billOperate/signBulkOrder`;
// 确认签收整车订单
$api_get_signWholeOrder = `/api/sdc/billOperate/signWholeOrder`;
// 上传图片
public $api_upload_url = `/api/mdc/pbc/upload/multipartFile/file`;
// 根据用户id查用户信息（注意：nickName才是用户名称）
@ -89,66 +91,61 @@ export class OrderManagementService extends ShipperBaseService {
$api_calculate_cost = `/api/sdc/billFreightChangeApplication/getBulkSurchargeDetail`;
//运费变更申请计算费用-整车
$api_getWholeSurchargeDetail = `/api/sdc/billFreightChangeApplication/getWholeSurchargeDetail`;
//运费变更申请-大宗
$api_change_bulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`;
// 删除装卸货信息
//运费变更申请-大宗
$api_change_bulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`;
// 删除装卸货信息
$api_delete_Wholedeletebatch = `/api/sdc/unLoadingPlace/deletebatch`;
// 修改-大宗订单
// 修改-大宗订单
$api_set_modifyBulkOrder = `/api/sdc/billOperate/modifyBulkOrder`;
// 修改-整车订单
// 修改-整车订单
$api_set_modifyWholeOrder = `/api/sdc/billOperate/modifyWholeOrder`;
// 修改-整车订单详情
// 修改-整车订单详情
$api_set_getWholeOrderDetail = `/api/sdc/billOperate/getWholeOrderDetail`;
// 修改--大宗订单详情
// 修改--大宗订单详情
$api_set_getBulkOrderDetail = `/api/sdc/billOperate/getBulkOrderDetail`;
// 批量修改网络货运人
// 批量修改网络货运人
$api_set_updateEnterpriseInfoBatch = `/api/sdc/billOperate/updateEnterpriseInfoBatch`;
// 批量修改附加费率
// 批量修改附加费率
$api_set_updateAdditionalRateBatch = `/api/sdc/billOperate/updateAdditionalRateBatch`;
// 查询投诉列表
// 查询投诉列表
$api_get_operate_listPage = `/api/sdc/complaint/operate/listPage`;
// 获取投诉表详情
// 获取投诉表详情
$api_get_getComplaintDriverDetails = `/api/sdc/complaint/operate/getComplaintDriverDetails`;
// 处理投诉
// 处理投诉
$api_get_dealWithComplaint = `/api/sdc/complaint/operate/dealWithComplaint`;
// 撤销投诉
// 撤销投诉
$api_get_canelComplaint = `/api/sdc/complaint/operate/canelComplaint`;
// 批量修改车队长
// 批量修改车队长
$api_get_updateCarCaptainBatch = `/api/sdc/billOperate/updateCarCaptainBatch`;
// 根据手机号查询车队长/司机
// 根据手机号查询车队长/司机
$api_get_getCarCaptainByMobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`;
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
/**
// 获取货主企业列表
public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList';
/**
* 根据企业ID，获取企业历史网络货运人
* @returns
*/
getNetworkFreightForwarderHistory(params: any) {
const param = {
enterpriseIds: params.enterpriseInfoIds
}
return this.request(this.$api_get_getEnterpriseNetTransHis, param).pipe(
map((res: any) => {
if (!res) {
return [];
}
const list = res.map((item: any) => ({
label: item.networkTransporterName,
value: item.networkTransporterId
}));
return [{ value: '', label: '全部' }, ...list];
})
);
}
constructor(public injector: Injector,public eaCacheSrv: EACacheService) {
super(injector,eaCacheSrv)
getNetworkFreightForwarderHistory(params: any) {
const param = {
enterpriseIds: params.enterpriseInfoIds
};
return this.request(this.$api_get_getEnterpriseNetTransHis, param).pipe(
map((res: any) => {
if (!res) {
return [];
}
const list = res.map((item: any) => ({
label: item.networkTransporterName,
value: item.networkTransporterId
}));
return [{ value: '', label: '全部' }, ...list];
})
);
}
constructor(public injector: Injector, public eaCacheSrv: EACacheService) {
super(injector, eaCacheSrv);
}
}