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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-01-18 15:49:13 +08:00
parent 9d1ba35333 e3ffe66a67
commit 7d0d2fb7da
21 changed files with 163 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-17 17:11:26
* @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
@ -63,6 +63,20 @@
<ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency}}
</ng-template>
<ng-template st-row="loadingTime" let-item let-index="index">
<div *ngIf="item?.loadingTime">装 | {{item?.loadingTime}}</div>
<div *ngIf="item?.unloadingTime">卸 | {{item?.unloadingTime}}</div>
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div>
{{item?.driverName}}/{{item?.driverPhone}}
</div>
</ng-template>
<ng-template st-row="payeeName" let-item let-index="index">
<div>
{{item?.payeeName}}/{{item?.payeePhone}}
</div>
</ng-template>
<ng-template st-row="billCode" let-item let-index="index">
<a [routerLink]="'/order-management/bulk-detail/'+item.id">{{item.billCode}}</a>
<div>
@ -80,7 +94,7 @@
<ng-template st-row="mybidDetailInfo" let-item let-index="index">
<div *ngIf="item.mybidDetailInfo.length > 0">
<p *ngFor="let data of item.mybidDetailInfo">
{{ data.expenseName }}：{{ data.price }}
{{ data.expenseName }}：{{ data.price | currency }}
<span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>

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

@ -249,7 +249,7 @@ tabs = {
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.id } as SFSchemaEnum))))
.pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.appUserId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -273,7 +273,7 @@ tabs = {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q,
model: 1, type: 2 })
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -441,11 +441,12 @@ tabs = {
{
title: '运费明细',
width: '250px',
className: 'text-left',
className: 'text-right',
render: 'mybidDetailInfo',
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '托运人', index: 'enterpriseProjectName', width: '120px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
{ title: '所属项目', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
{ title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-left' },
{ title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
@ -474,25 +475,27 @@ tabs = {
},
{
title: '结算重量',
className: 'text-left',
className: 'text-right',
index: 'settlementWeight',
width: '100px',
width: '150px',
},
{
title: '承运司机',
className: 'text-left',
width: '180px',
index: 'driverName',
width: '100px',
render: 'driverName'
},
{
title: '收款人',
className: 'text-left',
width: '180px',
index: 'payeeName',
width: '100px',
render: 'payeeName',
},
{
title: '装卸货时间',
width: '180px',
width: '200px',
className: 'text-left',
render: 'loadingTime'
},

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 20:33:22
* @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
@ -131,12 +131,17 @@
<nz-card nzTitle="运费信息" #distannce3>
<st #st [data]="i?.billExpenseDetails" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="price" let-item let-index="index">
{{ item.price | currency}}
</ng-template>
<ng-template st-row="surcharge" let-item let-index="index">
{{ item.surcharge | currency}}
</ng-template>
</st>
<div>
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '￥' }}</span> （运费￥{{
totalObj?.price - attObj?.price
}}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span> （运费{{
totalObj?.price - attObj?.price | currency
}}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card>

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

@ -2,7 +2,7 @@ import { ViewChild } from '@angular/core';
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 14:19:10
* @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
@ -35,9 +35,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit {
isVisible = false;
logColumns: STColumn[] = [
{ title: '款项', index: 'costName' },
{ title: '总费用（元）', index: 'price' },
{ title: '协议金额（元）', index: 'price' },
{ title: '附加费（元）', index: 'surcharge' },
{ title: '总费用（元）', index: 'price',render: 'price' },
{ title: '协议金额（元）', index: 'price',render: 'price' },
{ title: '附加费（元）', index: 'surcharge', render: 'surcharge'},
{ title: '附加费率（%）', index: 'paymentMethodRate' },
{ title: '支付时间', index: ' paymentTime' },
{

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-17 17:50:57
* @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
@ -99,18 +99,12 @@
</ng-template>
<ng-template st-row="driverName" let-item let-index="index">
<div>
{{item?.driverName}}
</div>
<div>
{{item?.driverPhone}}
{{item?.driverName}}/{{item?.driverPhone}}
</div>
</ng-template>
<ng-template st-row="payeeName" let-item let-index="index">
<div>
{{item?.payeeName}}
</div>
<div>
{{item?.payeePhone}}
{{item?.payeeName}}/{{item?.payeePhone}}
</div>
</ng-template>
<ng-template st-row="loadingTime" let-item let-index="index">

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

@ -269,7 +269,7 @@ resourceStatus: any;
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q,
model: 1, type: 2 })
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.pipe(map((res) => (res as any[]).map((i) => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -401,24 +401,24 @@ resourceStatus: any;
{
title: '我的出价',
width: '200px',
className: 'text-left',
className: 'text-right',
render: 'mybidInfo'
},
{
title: '运费明细',
width: '250px',
className: 'text-left',
className: 'text-right',
render: 'mybidDetailInfo',
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '170px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '170px', className: 'text-left' },
{ title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-left' },
{ title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-left' },
{ title: '装货地', index: 'loadingAddressArr', width: '170px', className: 'text-left' },
{ title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-left' },
{
title: '卸货地',
className: 'text-left',
width: '170px',
width: '180px',
index: 'unloadingAddressArr'
},
{
@ -429,18 +429,18 @@ resourceStatus: any;
}, {
title: '承运司机',
className: 'text-left',
width: '120px',
width: '180px',
render: 'driverName'
},
{
title: '收款人',
className: 'text-left',
render: 'payeeName',
width: '100px',
width: '180px',
},
{
title: '装卸货时间',
width: '170px',
width: '200px',
className: 'text-left',
render: 'loadingTime'
},

6
src/app/routes/supply-management/components/bulk/bulk.component.ts
View File

@ -232,10 +232,10 @@ export class SupplyManagementBulkComponent implements OnInit {
render: 'resourceCode'
},
{ title: '服务类型', index: 'serviceTypeLabel', width: '150px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '200px', className: 'text-left' },
{ title: '项目名称', index: 'enterpriseProjectName', width: '200px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '220px', className: 'text-left' },
{ title: '项目名称', index: 'enterpriseProjectName', width: '220px', className: 'text-left' },
{ title: '关联订单', render: 'orderSn', width: '200px', className: 'text-left' },
{ title: '货物信息', render: 'goodsInfos', width: '200px', className: 'text-left' },
{ title: '货物信息', render: 'goodsInfos', width: '280px', className: 'text-left' },
{
title: '装货地',
className: 'text-left',

2
src/app/routes/usercenter/components/freight/user/user.component.ts
View File

@ -136,7 +136,7 @@ export class FreightComponentsUserComponent implements OnInit {
showRequired: false
}
},
contactsName: {
enterpriseName: {
title: '企业名称',
type: 'string',
ui: {

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

@ -118,7 +118,7 @@
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
</sv>
<sv label="行驶证签发机关">
<input nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
<input nz-input style="width: '300px'" type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
</sv>
</sv-container>
@ -153,7 +153,7 @@
[placeholder]="isEdit?'':'-'">
</sv>
<sv label="所有人">
<input nz-input type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit" [nzBorderless]="!isEdit"
<input nz-input style="width: '300px'" type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
</sv>
</sv-container>

4
src/app/routes/vehicle/components/list/detail/detail.component.html
View File

@ -109,7 +109,7 @@
[nzPlaceHolder]="isEdit?'':'-'" [nzBorderless]="!isEdit" [nzSuffixIcon]="isEdit?'calendar':''"></nz-date-picker>
</sv>
<sv label="行驶证签发机关">
<input nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
<input style="width: '300px'" nz-input type="text" [(ngModel)]="detailData.driverLicenseSigningOrg" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
</sv>
</sv-container>
@ -144,7 +144,7 @@
[placeholder]="isEdit?'':'-'">
</sv>
<sv label="所有人">
<input nz-input type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit" [nzBorderless]="!isEdit"
<input style="width: '300px'" nz-input type="text" [(ngModel)]="detailData.carOwner" [readonly]="!isEdit" [nzBorderless]="!isEdit"
[placeholder]="isEdit?'':'-'">
</sv>
</sv-container>

2
src/app/routes/vehicle/components/list/list.component.ts
View File

@ -182,7 +182,7 @@ export class VehicleComponentsListComponent implements OnInit {
},
roadTransportStatus: {
type: 'string',
title: '驾驶证到期状态',
title: '道运证到期状态',
enum: [
{ label: '正常', value: 1 },
{ label: '即将到期', value: 2 },

26
src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-24 15:38:08
* @LastEditTime: 2022-01-11 19:47:31
* @LastEditTime: 2022-01-18 14:25: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\sys-setting\components\crm-management\crm-management.component.html
@ -52,12 +52,13 @@
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading"
[scroll]="{ y: '370px' }"
[scroll]="{ x: '2000px' }"
>
<ng-template st-row="customerType" let-item let-index="index">
<ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
<div>
<span *ngIf="item?.customerType == 1">客户</span>
<span *ngIf="item?.customerType == 2">供应商</span>
<span *ngIf="item?.exceptionCertificateFirstFilePath"><img style="width: 40px;" [src]="item?.exceptionCertificateFirstFilePath" alt=""></span>
<span *ngIf="item?.exceptionCertificateSecondFilePath"><img style="width: 40px;"[src]="item?.exceptionCertificateSecondFilePath" alt=""></span>
<span *ngIf="item?.exceptionCertificateThirdFilePath"><img style="width: 40px;" [src]="item?.exceptionCertificateThirdFilePath" alt=""></span>
</div>
</ng-template>
</st>
@ -65,7 +66,7 @@
<nz-tab nzTitle="已回复">
<st
#st2
[data]="service.$api_get_listOperatePage"
[data]="service.$api_get_listOperateReplyPage"
[columns]="columns2"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
@ -73,12 +74,13 @@
[loading]="service.http.loading"
[scroll]="{ y: '370px' }"
>
<ng-template st-row="customerType" let-item let-index="index">
<div>
<span *ngIf="item?.customerType == 1">客户</span>
<span *ngIf="item?.customerType == 2">供应商</span>
</div>
</ng-template>
<ng-template st-row="exceptionCertificateFirstFilePath" let-item let-index="index">
<div>
<span *ngIf="item?.exceptionCertificateFirstFilePath"><img style="width: 40px;" [src]="item?.exceptionCertificateFirstFilePath" alt=""></span>
<span *ngIf="item?.exceptionCertificateSecondFilePath"><img style="width: 40px;"[src]="item?.exceptionCertificateSecondFilePath" alt=""></span>
<span *ngIf="item?.exceptionCertificateThirdFilePath"><img style="width: 40px;" [src]="item?.exceptionCertificateThirdFilePath" alt=""></span>
</div>
</ng-template>
</st>
</nz-tab>
</nz-tabset>

25
src/app/routes/waybill-management/components/abnormal-appear/abnormal-appear.component.ts
View File

@ -31,16 +31,16 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
selectedIndex = 0;
columns: STColumn[] = [
{ title: '异常编号', index: 'exceptionCode',width: '180px' },
{ title: '关联运单号', index: 'wayBillCode',width: '180px' },
{ title: '网络货运人', index: 'enterpriseInfoName',width: '180px' },
{ title: '货主', index: 'shipperAppUserName' ,width: '180px'},
{ title: '装货地', index: 'loadingPlace' ,width: '180px'},
{ title: '卸货地', index: 'dischargePlace' ,width: '180px'},
{ title: '承运司机', index: 'driver' ,width: '90px'},
{ title: '异常信息', index: 'exceptionContent',width: '250px' },
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '220px'},
{ title: '上报时间', index: 'createTime',width: '180px' },
{ title: '异常编号', index: 'exceptionCode',width: '180px',className: 'text-left', },
{ title: '关联运单号', index: 'wayBillCode',width: '180px',className: 'text-left', },
{ title: '网络货运人', index: 'enterpriseInfoName',width: '220px',className: 'text-left', },
{ title: '货主', index: 'shipperAppUserName' ,width: '220px',className: 'text-left',},
{ title: '装货地', index: 'loadingAddressArr' ,width: '220px',className: 'text-left',},
{ title: '卸货地', index: 'unloadingAddressArr' ,width: '220px',className: 'text-left',},
{ title: '承运司机', index: 'driver' ,width: '250px',className: 'text-left',},
{ title: '异常信息', index: 'exceptionContent',width: '250px',className: 'text-left', },
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '200px',className: 'text-left',},
{ title: '上报时间', index: 'createTime',width: '180px' ,className: 'text-left',},
];
columns2: STColumn[] = [
{ title: '异常编号', index: 'exceptionCode',width: '180px' },
@ -52,7 +52,10 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
{ title: '承运司机', index: 'driver' ,width: '90px'},
{ title: '异常信息', index: 'exceptionContent',width: '250px' },
{ title: '异常图片', render: 'exceptionCertificateFirstFilePath' ,width: '220px'},
{ title: '上报时间', index: 'createTime',width: '180px' },
{ title: '上报时间', index: 'reportingTime',width: '180px' },
{ title: '回复内容', index: 'replyContent',width: '180px' },
{ title: '回复人', index: 'replyAppUserName',width: '180px' },
{ title: '回复时间', index: 'replyTime',width: '180px' },
];
get reqParams (){

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 16:43:37
* @LastEditTime: 2022-01-18 14:34:10
* @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
@ -138,17 +138,19 @@
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<div style="margin-bottom: 18px">
<span style="color: #da001b; font-size: 18px"> {{ i?.goodsInfos?.[0]?.freightPrice }}{{ i?.goodsInfos?.[0]?.freightTypeLabel }} </span>（{{ i?.goodsInfos?.[0]?.settlementBasisLabel }}，{{
<span style="color: #da001b; font-size: 18px"> {{ i?.goodsInfos?.[0]?.freightPrice | currency }}{{ i?.goodsInfos?.[0]?.freightTypeLabel }} </span>（{{ i?.goodsInfos?.[0]?.settlementBasisLabel }}，{{
i?.goodsInfos?.[0]?.ruleLabel
}}）</div
>
<st #st [data]="i?.billExpenseDetailVOList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="price" let-item let-index="index">
{{ item.price | currency}}
</ng-template>
</st>
<div>
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '￥' }}</span> （运费￥{{
totalObj?.price - attObj?.price
}}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span> （运费{{
totalObj?.price - attObj?.price | currency
}}，附加运费{{ attObj?.price | currency}}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}</div>
</nz-card>

4
src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2021-12-28 16:43:55
* @LastEditTime: 2022-01-18 14:32: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\components\vehicle-detail\vehicle-detail.component.ts
@ -30,7 +30,7 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
isVisible = false;
logColumns: STColumn[] = [
{ title: '款项', index: 'expenseName' },
{ title: '运输费（元）', index: 'price' },
{ title: '运输费（元）', index: 'price',render: 'price' },
{ title: '支付时间', index: ' paymentTime' },
{
title: '支付状态',

7
src/app/routes/waybill-management/components/bulk/bulk.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-13 16:14:43
* @LastEditTime: 2022-01-18 14:29: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\supply-management\components\vehicle\vehicle.component.html
@ -68,10 +68,13 @@
<span *ngIf="item?.wayBillStatus == 6">已取消</span>
</div>
</ng-template>
<ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency}}
</ng-template>
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
<div *ngIf="item.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item.billExpenseDetailVOList">
{{ data.costCodeLabel }}：{{ data.price }}
{{ data.costCodeLabel }}：{{ data.price |currency }}
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>

34
src/app/routes/waybill-management/components/bulk/bulk.component.ts
View File

@ -105,9 +105,26 @@ tabs = {
type: 'string',
title: '货源编号'
},
no1: {
shipperAppUserId: {
type: 'string',
title: '货主'
title: '货主',
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
console.log(q)
if (!!q) {
return this.service
.request(this.service.$api_enterpriceList, { enterpriseName: q})
.pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
} as SFSelectWidgetSchema,
},
loadingPlace: {
type: 'string',
@ -362,18 +379,18 @@ tabs = {
{
title: '运费明细',
width: '220px',
className: 'text-left',
className: 'text-right',
render: 'billExpenseDetailVOList'
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-left' },
{ title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-left' },
{ title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingPlace', width: '220px', className: 'text-left' },
{
title: '卸货地',
className: 'text-left',
width: '180px',
width: '220px',
index: 'dischargePlace'
},
{
@ -384,9 +401,10 @@ tabs = {
},
{
title: '运费单价',
className: 'text-left',
className: 'text-right',
width: '120px',
index: 'freightPrice'
index: 'freightPrice',
render: 'freightPrice'
},
{
title: '接单数量',

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 16:55:33
* @LastEditTime: 2022-01-18 14:35:53
* @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
@ -138,6 +138,9 @@
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<st #st [data]="i?.billExpenseDetailVOList" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="price" let-item let-index="index">
{{ item.price | currency}}
</ng-template>
</st>
<div>
总计：<span style="color: #da001b; font-size: 18px">{{ i?.freight | currency: '￥' }}</span>

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

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 16:52:42
* @LastEditTime: 2022-01-18 14:36: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\components\vehicle-detail\vehicle-detail.component.ts
@ -30,7 +30,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
isVisible = false;
logColumns: STColumn[] = [
{ title: '款项', index: 'costName' },
{ title: '运输费（元）', index: 'price' },
{ title: '运输费（元）', index: 'price', render: 'price' },
{ title: '支付时间', index: ' paymentTime' },
{
title: '支付状态',

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime: 2022-01-13 16:14:58
* @LastEditTime: 2022-01-17 20:13:41
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\supply-management\components\vehicle\vehicle.component.html
@ -60,14 +60,14 @@
<ng-template st-row="billExpenseDetailVOList2" let-item let-index="index">
<div *ngIf="item.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item.billExpenseDetailVOList">
{{ data.costCodeLabel }}：{{ data.price }}
{{ data.costCodeLabel }}：{{ data.price | currency }}
</p>
</div>
</ng-template>
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
<div *ngIf="item.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item.billExpenseDetailVOList">
{{ data.costCodeLabel }}：{{ data.price }}
{{ data.costCodeLabel }}：{{ data.price | currency}}
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
@ -84,7 +84,7 @@
</div>
</ng-template>
<ng-template st-row="wayBill" let-item let-index="index">
<a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
<a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.billCode}}</a>
</ng-template>
<ng-template st-row="goodsInfos" let-item let-index="index">
<div>{{item?.goodsInfos?.goodsName}}</div>

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

@ -64,14 +64,20 @@ export class WaybillManagementVehicleComponent implements OnInit {
* 查询参数
*/
get reqParams() {
const a: any = {};
const a:any = {};
if (this.resourceStatus) {
a.wayBillStatus = this.resourceStatus;
}
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
return {
...a,
...this.sf?.value
};
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
end: this.sf?.value?.createTime?.[1] || '',
},
};
}
get selectedRows() {
return this.st?.list.filter(item => item.checked) || [];
@ -150,7 +156,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 1 })
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.appUserId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -175,7 +181,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.carNo } as SFSchemaEnum))))
.pipe(map((res: any) => (res?.records as any[]).map(i => ({ label: i.carNo, value: i.id } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -198,7 +204,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
if (!!q) {
return this.service
.request(this.service.$api_get_getDriverInfo, { keyword: q, model: 1, type: 2 })
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.id } as SFSchemaEnum))))
.pipe(map(res => (res as any[]).map(i => ({ label: i.name, value: i.userId } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -214,7 +220,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'payment:status' },
params: { dictKey: 'overall:payment:status' },
containAllLable: true,
visibleIf: {
_$expand: (value: boolean) => value
@ -249,7 +255,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
}
}
},
enterpriseInfoName: {
enterpriseInfoId: {
type: 'string',
title: '网络货运人',
ui: {
@ -320,17 +326,17 @@ export class WaybillManagementVehicleComponent implements OnInit {
{
title: '货主出价',
width: '250px',
className: 'text-left',
className: 'text-right',
render: 'billExpenseDetailVOList2'
},
{
title: '费用明细',
width: '250px',
className: 'text-left',
className: 'text-right',
render: 'billExpenseDetailVOList'
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '150px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '220px', className: 'text-left' },
{ title: '货主', index: 'shipperAppUserName', width: '200px', className: 'text-left' },
{ title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
{
@ -541,7 +547,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
this.isVisibleEvaluate = true;
}
getGoodsSourceStatistical() {
this.service.request(this.service.$api_get_getWholeStatistics).subscribe(res => {
this.service.request(this.service.$api_get_getWholeStatistics, this.reqParams).subscribe(res => {
if (res) {
let totalCount = 0;
res.forEach((ele: any) => {