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-02-21 20:39:38 +08:00
parent 901a5f0cdb 5a3ea6ca50
commit 85ff5d3c78
14 changed files with 361 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/routes/order-management/components/compliance-audit/compliance-audit.component.ts
View File

@ -10,7 +10,6 @@ import { ConfirReceiptComponent } from '../../modal/bulk/confir-receipt/confir-r
import { of } from 'rxjs';
import { ShipperBaseService } from '@shared';
import { Router } from '@angular/router';
import { orderManagementVoucherViewComponent } from '../../modal/audit/voucher-view/voucher-view.component';
@Component({
selector: 'app-order-management-compliance-audit',

160
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.html
View File

@ -4,19 +4,26 @@
* @Author : Shiming
* @Date : 2022-01-12 10:52:50
* @LastEditors : Shiming
* @LastEditTime : 2022-02-15 15:03:39
* @LastEditTime : 2022-02-21 20:16:13
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\receipts-audit\\receipts-audit.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">
</page-header-wrapper>
<page-header-wrapper [title]="''"> </page-header-wrapper>
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
(formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
@ -25,10 +32,10 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.text-right]="_$expand">
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="search()">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading"
>导出</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()" acl [acl-ability]="['ORDER-RECEIPTS-search']"
>查询</button
>
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
@ -40,87 +47,78 @@
</nz-card>
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)"
[nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部('+tabs?.totalCount+')'"></nz-tab>
<nz-tab [nzTitle]="'待审核('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已审核('+tabs?.stayQuantity+')'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px;">
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzTabBarExtraContent]="extraTemplate">
<nz-tab [nzTitle]="'全部(' + tabs?.totalCount + ')'"></nz-tab>
<nz-tab [nzTitle]="'待审核(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已审核(' + tabs?.stayQuantity + ')'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px">
<st
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_billExamine_page"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[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"
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_billExamine_page"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[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"
>
<ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency}}
</ng-template>
<ng-template st-row="loadingLadingBillFilePath" let-item let-index="index">
<div>
<span><img style="height: 60px; padding-right: 5px;" [src]="item.loadingLadingBillFilePath" alt=""></span>
<span><img style="height: 60px;" [src]="item.loadingPeopleVehiclesGoodsFilePath" alt=""></span>
</div>
</ng-template>
<ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index">
<span><img style="height: 60px; padding-right: 5px;" [src]="item.unloadingLadingBillFilePath" alt=""></span>
<span><img style="height: 60px;" [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt=""></span>
</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}}/{{item?.carNo}}
</div>
<ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency }}
</ng-template>
<ng-template st-row="loadingLadingBillFilePath" let-item let-index="index">
<div>
<span><img style="height: 60px; padding-right: 5px" [src]="item.loadingLadingBillFilePath" alt="" /></span>
<span><img style="height: 60px" [src]="item.loadingPeopleVehiclesGoodsFilePath" alt="" /></span>
</div>
</ng-template>
<ng-template st-row="unloadingLadingBillFilePath" let-item let-index="index">
<span><img style="height: 60px; padding-right: 5px" [src]="item.unloadingLadingBillFilePath" alt="" /></span>
<span><img style="height: 60px" [src]="item.unloadingPeopleVehiclesGoodsFilePath" alt="" /></span>
</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 }}/{{ item?.carNo }} </div>
</ng-template>
<ng-template st-row="payeeName" let-item let-index="index">
<div>
{{item?.payeeName}}/{{item?.payeePhone}}
</div>
<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>
<span>{{item?.billStatusLabel}}</span>
</div>
<div>
<span >{{item?.billTypeLabel}}{{item?.serviceTypeLabel}}</span>
</div>
</ng-template>
<ng-template st-row="goodsName" let-item let-index="index">
<div>{{ item?.goodsName }}</div>
<div>
<span>{{ item?.weight ? item?.weight + '吨/' : '' }}</span>
<span>{{ item?.volume ? item?.volume + '方/' : '' }}</span>
<span>{{ item?.goodsNumber ? item?.goodsNumber + '件' : '' }}</span>
</div>
</ng-template>
<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 | currency }}
<span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</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>
<span>{{item?.serviceTypeName}}</span>
</div>
<div>
<span>{{item?.auditStatusLabel}}</span>
</div>
</ng-template>
<ng-template st-row="goodsName" let-item let-index="index">
<div>{{item?.goodsName}}</div>
<div>
<span>{{item?.weight ? item?.weight + '吨/' : '' }}</span>
<span>{{item?.volume ? item?.volume + '方/' : '' }}</span>
<span>{{item?.goodsNumber ? item?.goodsNumber + '吨' : '' }}</span>
</div>
</ng-template>
<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 | currency }}
<span *ngIf="data.paymentStatusLabel" style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
</st>
</div>
</nz-card>
<ng-template #extraTemplate>
<div>
<button nz-button nzType="primary" (click)="sign('1')">
批量签收
</button>
<button nz-button nzType="primary" (click)="sign1('1')">
批量生成电子单据
</button>
<button nz-button nzType="primary" (click)="sign('1')" acl [acl-ability]="['ORDER-RECEIPTS-billAuditPassBatch']"> 批量签收 </button>
<button nz-button nzType="primary" (click)="sign1('1')" acl [acl-ability]="['ORDER-RECEIPTS- electronicBilling']"> 批量生成电子单据 </button>
</div>
</ng-template>
</ng-template>

40
src/app/routes/order-management/components/receipts-audit/receipts-audit.component.ts
View File

@ -81,9 +81,9 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
if (res) {
let totalCount = 0;
res.forEach((element: any) => {
if (element.billStatusLabel === '待审核') {
if (element.auditStatus == '1') {
this.tabs.receivedQuantity = element.quantity;
} else if (element.billStatusLabel === '已审核') {
} else if (element.auditStatus == '2') {
this.tabs.stayQuantity = element.quantity;
}
totalCount += element.quantity;
@ -329,33 +329,33 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
{
title: '操作',
fixed: 'right',
width: '120px',
width: '136px',
className: 'text-left',
buttons: [
{
text: '通过',
text: '生成电子单据',
click: _record => this.generate(_record, 2),
iif: item => item.auditStatus == '1',
acl: { ability: ['ORDER-RECEIPTS-electronicBillingOne'] },
},
{
text: '通过　　　　',
click: _record => this.sign(_record),
iif: item => item.auditStatus == '1',
acl: { ability: ['ORDER-RECEIPTS-billAuditPassBatch'] },
},
{
text: '生成电子单据',
click: _record => this.generate(_record, 2),
iif: item => item.auditStatus == '1',
acl: { ability: ['ORDER-RECEIPTS-generate'] },
},
{
text: '查看凭证',
click: _record => this.generate(_record, 3),
iif: item => item.auditStatus == '2',
acl: { ability: ['ORDER-RECEIPTS-view'] },
},
{
text: '修改',
text: '修改　　　　',
click: _record => this.modification(_record),
iif: item => item.auditStatus == '1' ,
acl: { ability: ['ORDER-RECEIPTS-updateBillExamine'] },
},
{
text: '查看凭证　',
click: _record => this.generate(_record, 3),
iif: item => item.auditStatus == '2',
acl: { ability: ['ORDER-RECEIPTS-view'] },
},
]
}
];
@ -414,8 +414,12 @@ export class OrderManagementReceiptsAuditComponent implements OnInit {
}
// 生成电子单据
generate(item: any, sts?: number) {
let text = '查看凭证';
if(sts == 2) {
text = '生成电子单据';
}
const modalRef = this.modal.create({
nzTitle: '查看凭证',
nzTitle: text,
nzWidth: '50%',
nzContent: orderManagementVoucherViewComponent,
nzComponentParams: {

5
src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.html
View File

@ -4,11 +4,11 @@
* @Author : Shiming
* @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming
* @LastEditTime : 2022-02-15 15:12:02
* @LastEditTime : 2022-02-21 20:25:47
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\audit\\voucher-view\\voucher-view.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved.
-->
<div class="sfBox" [ngClass]="Status !== 1 ? 'hideBtn' : ''">
<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">
@ -23,6 +23,7 @@
</div>
</ng-template>
</sf>
</div>
<div class="modal-footer">
<button nz-button type="button" *ngIf="Status === 1" (click)="close()">关闭</button>

113
src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.less
View File

@ -1,7 +1,106 @@
.left_btn {
width: 50px;
height: 32px;
padding-left: 8px;
line-height:32px;
background-color: #d7d7d7;
}
:host{
::ng-deep {
.ant-input-borderless{
padding: 0;
padding-top: 4px;
color: black;
resize:none;
}
.hideBtn .ant-upload-list-item-actions button{
&:last-child{
display: none;
}
}
}
}
.sfBox {
position: relative;
.example {
position: absolute;
top: 215px;
right: 265px;
color: #1890ff;
cursor: pointer;
.popBox {
position: absolute;
top: -170px;
left: -125px;
width: 300px;
padding: 20px;
text-align: center;
background: #fff;
border: solid 1px #eee;
border-radius: 6px;
box-shadow: 0 1px 5px 1px #ececec;
&::before {
position: absolute;
bottom: -5px;
left: 50%;
width: 10px;
height: 10px;
margin-left: -5px;
background: #fff;
box-shadow: 0 1px 5px 1px #ececec;
transform: rotate(45deg);
content: '';
}
&::after {
position: absolute;
bottom: 0;
left: 0;
z-index: 10;
width: 100%;
height: 10px;
background: #fff;
content: '';
}
img {
max-width: 100%;
max-height: 200px;
}
}
}
.pr {
position: relative;
}
.pa {
position: absolute;
top: 35px;
left: 150px;
}
.tips {
display: flex;
margin-bottom: 0;
color: #333;
dt {
width: 150px;
}
dd {
width: 190px;
margin-bottom: 0;
text-align: center;
}
}
.positionSet{
top: 356px;
right: 235px;
}
.positionSet01{
top: 500px;
right: 200px;
}
.positionSet02{
top: 664px;
right: 265px;
}
.positionSet03{
top: 808px;
right: 205px;
}
}

10
src/app/routes/order-management/modal/audit/voucher-view/voucher-view.component.ts
View File

@ -48,7 +48,8 @@ export class orderManagementVoucherViewComponent implements OnInit {
this.initSF();
}
initSF() {
if(this.Status === 1) {
console.log(this.Status)
if(this.Status == 1) {
this.schema = {
properties: {
@ -216,6 +217,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ]
};
}else {
console.log('只读')
this.schema = {
properties: {
loadingLadingBillFilePath: {
@ -383,6 +385,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
} as SFUploadWidgetSchema,
}
},
required: ['loadingLadingBillFilePath', 'loadingPeopleVehiclesGoodsFilePath','unloadingLadingBillFilePath','unloadingPeopleVehiclesGoodsFilePath' ]
};
}
this.ui = {
@ -418,10 +421,7 @@ export class orderManagementVoucherViewComponent implements OnInit {
})
}
sure() {
const params = {
id: this.i.id,
}
console.log(params)
const params = [this.i.id];
this.service.request(this.service.$api_get_billAuditPass, params).subscribe((res) => {
if(res) {
this.service.msgSrv.success('审核成功！')

22
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-02-10 14:23:33
* @LastEditTime : 2022-02-21 20:12:17
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.html
@ -74,7 +74,7 @@
{{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件
</sv>
<sv label="用车需求">
{{i?.goodsInfos?.[0]?.carModelLabel}}/{{i?.goodsInfos?.[0]?.carLength}}
{{i?.goodsInfos?.[0]?.carModelLabel}}{{ i?.goodsInfos?.[0]?.carLength ? '/' + i?.goodsInfos?.[0]?.carLength + '米': ''}}
</sv>
<sv label="承运司机">
{{i?.driver?.name}}/{{i?.driver?.phone}}
@ -136,7 +136,7 @@
</div>
</div>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #distannce3>
<div style="margin-bottom: 18px">
<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
@ -152,7 +152,7 @@
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>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.payeeId }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>
@ -165,11 +165,11 @@
</sv-container>
<sv-container col="2" class="mt-md">
<sv label="装货凭证">
<app-imagelist [imgList]="[i?.loadingLadingBillFilePath,i?.loadingPeopleVehiclesGoodsFilePath]">
<app-imagelist [imgList]="i?.loadingCertificate">
</app-imagelist>
</sv>
<sv label="卸货凭证">
<app-imagelist [imgList]="[i?.unloadingLadingBillFilePath,i?.unloadingPeopleVehiclesGoodsFilePath]">
<app-imagelist [imgList]="i?.unLoadingCertificate">
</app-imagelist>
</sv>
</sv-container>
@ -177,19 +177,19 @@
<nz-card nzTitle="补充信息">
<sv-container>
<sv label="是否回单">
{{i?.goodsResource?.stateReceipt ?'是':'否'}}
{{i?.receiptType == 1 ?'是':'否'}}
</sv>
<sv label="回单类型">
{{i?.goodsResource?.receiptTypeLabel}}
{{i?.receiptTypeLabel}}
</sv>
<sv label="联系人">
{{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
{{i?.receiptUser}} / {{i?.receiptUserPhone}}
</sv>
<sv label="所在地区">
{{i?.goodsResource?.receiptAddress}}
{{i?.receiptPlace}}
</sv>
<sv label="详细地址">
{{i?.goodsResource?.receiptAddress}}
{{i?.receiptAddress}}
</sv>
</sv-container>

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

@ -1,10 +1,10 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-18 14:32:49
* @LastEditors: Please set LastEditors
* @LastEditTime : 2022-02-21 19:52:43
* @LastEditors : Shiming
* @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
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk-detail\\bulk-detail.component.ts
*/
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
@ -29,9 +29,9 @@ export class WaybillManagementBulkeDetailComponent implements OnInit {
attObj: any;
isVisible = false;
logColumns: STColumn[] = [
{ title: '款项', index: 'expenseName' },
{ title: '款项', index: 'costName' },
{ title: '运输费（元）', index: 'price',render: 'price' },
{ title: '支付时间', index: ' paymentTime' },
{ title: '支付时间', index: 'paymentTime' },
{
title: '支付状态',
className: 'text-center',

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

@ -1,20 +1,27 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime : 2022-02-10 14:21:32
* @LastEditTime : 2022-02-21 19:42:59
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\bulk\\bulk.component.html
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">
</page-header-wrapper>
<page-header-wrapper [title]="''"> </page-header-wrapper>
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
(formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
@ -23,9 +30,8 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="search()">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
@ -37,58 +43,63 @@
</nz-card>
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
<nz-tab [nzTitle]="'全部('+tabs?.totalQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已取消('+tabs?.deltQuantity+')'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px;">
<nz-tabset (nzSelectedIndexChange)="selectChange($event)">
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px">
<st
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_Bulkpage"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[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"
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_Bulkpage"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[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"
>
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </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="wayBillCode" let-item let-index="index">
<a [routerLink]="'bulk-detail/'+item.id">{{item.wayBillCode}}</a>
<a [routerLink]="'bulk-detail/' + item?.id">{{ item?.wayBillCode }}</a>
<div>
<span *ngIf="item?.wayBillStatus == 1">待接单</span>
<span *ngIf="item?.wayBillStatus == 2">待发车</span>
<span *ngIf="item?.wayBillStatus == 3">运输中</span>
<span *ngIf="item?.wayBillStatus == 4">待签收</span>
<span *ngIf="item?.wayBillStatus == 5">已完成</span>
<span *ngIf="item?.wayBillStatus == 6">已取消</span>
<span>{{item?.wayBillStatusLabel}}</span>
</div>
<div>
<span >{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
</div>
</ng-template>
<ng-template st-row="freightPrice" let-item let-index="index">
{{ item.freightPrice | currency}}
{{ item?.freightPrice }}/吨
<div>{{item?.settlementBasisLabel}}</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 |currency }}
<div *ngIf="item?.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item?.billExpenseDetailVOList">
{{ data.costCodeLabel }}：{{ data.price | currency }}
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
<ng-template st-row="wayBill" let-item let-index="index">
<a [routerLink]="'/waybill-management/bulk-detail/'+item.id">{{item.wayBillCode}}</a>
<a [routerLink]="'/waybill-management/bulk-detail/' + item?.id">{{ item?.wayBillCode }}</a>
</ng-template>
<ng-template st-row="goodsInfos" let-item let-index="index">
<div>{{item?.goodsInfos?.goodsName}}</div>
<div>{{item?.goodsInfos?.goodsResource}}</div>
<div>{{ item?.goodsInfos?.goodsName }}</div>
<div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume? '/' +item?.goodsInfos?.volume : '' }}{{ item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div>
</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>
<div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
<div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
</ng-template>
</st>
</div>

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

@ -248,7 +248,7 @@ tabs = {
},
{ 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: 'billCode', width: '180px', className: 'text-left' },
{ title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingPlace', width: '220px', className: 'text-left' },
{
@ -260,14 +260,13 @@ tabs = {
{
title: '货物信息',
className: 'text-left',
width: '180px',
width: '250px',
render: 'goodsInfos'
},
{
title: '运费单价',
className: 'text-right',
width: '120px',
index: 'freightPrice',
render: 'freightPrice'
},
{
@ -286,14 +285,14 @@ tabs = {
{
title: '承运司机',
className: 'text-left',
width: '200px',
index: 'driverName'
width: '250px',
render: 'driverName'
},
{
title: '收款人',
className: 'text-left',
width: '120px',
index: 'payeeName'
width: '200px',
render: 'payeeName',
},
{
title: '装卸货时间',

34
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-02-10 14:16:02
* @LastEditTime : 2022-02-21 20:11:32
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html
@ -74,7 +74,7 @@
{{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件
</sv>
<sv label="用车需求">
{{i?.goodsInfos?.[0]?.carModelLabel}}/{{i?.goodsInfos?.[0]?.carLength}}
{{i?.goodsInfos?.[0]?.carModelLabel}}{{ i?.goodsInfos?.[0]?.carLength ? '/' + i?.goodsInfos?.[0]?.carLength + '米': ''}}
</sv>
<sv label="承运司机">
{{i?.driverVo?.name}}/{{i?.driverVo?.phone}}
@ -88,15 +88,6 @@
<sv label="计划卸货时间">
{{i?.unloadingTime}}
</sv>
<sv label="接单数量">
{{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
</sv>
<sv label="装货数量">
{{i?.acceptWeight}}吨,{{i?.acceptVolume}}方,{{i?.acceptNumber}}件
</sv>
<sv label="卸货数量">
{{i?.settlementWeight}}吨,{{i?.settlementVolume}}方,{{i?.acceptNumber}}件
</sv>
</sv-container>
<div class="mt-md">
<h4 class="text-md">装货卸货信息
@ -136,16 +127,19 @@
</div>
</div>
</nz-card>
<nz-card nzTitle="运费信息" #distannce3>
<nz-card [nzTitle]="'运费信息' +'（到货后'+i?.paymentDays+'天内支付运费）'" #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>
<ng-template st-row="paymentTime" let-item let-index="index">
{{ item?.paymentTime}}
</ng-template>
</st>
<div>
总计：<span style="color: #da001b; font-size: 18px">{{ i?.freight | currency: '￥' }}</span>
</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}</div>
<div>收款人：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.payeeId }}</div>
</nz-card>
<nz-card nzTitle="附件信息" #distannce4>
@ -158,11 +152,11 @@
</sv-container>
<sv-container col="2" class="mt-md">
<sv label="装货凭证">
<app-imagelist [imgList]="[i?.loadingLadingBillFilePath,i?.loadingPeopleVehiclesGoodsFilePath]">
<app-imagelist [imgList]="i?.loadingCertificate">
</app-imagelist>
</sv>
<sv label="卸货凭证">
<app-imagelist [imgList]="[i?.unloadingLadingBillFilePath,i?.unloadingPeopleVehiclesGoodsFilePath]">
<app-imagelist [imgList]="i?.unLoadingCertificate">
</app-imagelist>
</sv>
</sv-container>
@ -170,19 +164,19 @@
<nz-card nzTitle="补充信息">
<sv-container>
<sv label="是否回单">
{{i?.goodsResource?.stateReceipt ?'是':'否'}}
{{i?.receiptType == 1 ?'是':'否'}}
</sv>
<sv label="回单类型">
{{i?.goodsResource?.receiptTypeLabel}}
{{i?.receiptTypeLabel}}
</sv>
<sv label="联系人">
{{i?.goodsResource?.receiptUserId}} / {{i?.supplementaryInformationVO?.phon}}
{{i?.receiptUser}}{{ i?.receiptUserPhone ? ' /' + i?.receiptUserPhone : ''}}
</sv>
<sv label="所在地区">
{{i?.goodsResource?.receiptAddress}}
{{i?.receiptPlace}}
</sv>
<sv label="详细地址">
{{i?.goodsResource?.receiptAddress}}
{{i?.receiptAddress}}
</sv>
</sv-container>

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

@ -1,10 +1,10 @@
/*
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-18 14:36:38
* @LastEditors: Please set LastEditors
* @LastEditTime : 2022-02-21 19:46:47
* @LastEditors : Shiming
* @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
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.ts
*/
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute } from '@angular/router';
@ -31,7 +31,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit {
logColumns: STColumn[] = [
{ title: '款项', index: 'costName' },
{ title: '运输费（元）', index: 'price', render: 'price' },
{ title: '支付时间', index: ' paymentTime' },
{ title: '支付时间', render: 'paymentTime' },
{
title: '支付状态',
className: 'text-center',

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

@ -1,20 +1,27 @@
<!--
* @Author: your name
* @Date: 2021-12-03 11:10:14
* @LastEditTime : 2022-02-10 14:21:52
* @LastEditTime : 2022-02-21 19:34:48
* @LastEditors : Shiming
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle\\vehicle.component.html
-->
<!-- 搜索表单 -->
<page-header-wrapper [title]="''">
</page-header-wrapper>
<page-header-wrapper [title]="''"> </page-header-wrapper>
<nz-card>
<div nz-row nzGutter="8">
<!-- 查询字段小于或等于3个时，不显示伸缩按钮 -->
<div nz-col nzSpan="24" *ngIf="queryFieldCount <= 4">
<sf #sf [schema]="schema" [ui]="ui" [mode]="'search'" [disabled]="!sf?.valid" [loading]="service.http.loading"
(formSubmit)="st?.load(1)" (formReset)="resetSF()"></sf>
<sf
#sf
[schema]="schema"
[ui]="ui"
[mode]="'search'"
[disabled]="!sf?.valid"
[loading]="service.http.loading"
(formSubmit)="st?.load(1)"
(formReset)="resetSF()"
></sf>
</div>
<!-- 查询字段大于3个时，根据展开状态调整布局 -->
@ -23,8 +30,7 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" [class.expend-options]="_$expand" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading"
(click)="search()">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="search()">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading">导出</button>
<button nz-button [disabled]="service.http.loading" (click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
@ -38,57 +44,65 @@
<nz-card>
<nz-tabset (nzSelectedIndexChange)="selectChange($event)">
<nz-tab [nzTitle]="'全部('+tabs?.totalQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待接单('+tabs?.stayQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待发车('+tabs?.receivedQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'运输中('+tabs?.cancelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'待签收('+tabs?.signQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已完成('+tabs?.compolatelQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'已取消('+tabs?.deltQuantity+')'"></nz-tab>
<nz-tab [nzTitle]="'全部(' + tabs?.totalQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'待接单(' + tabs?.stayQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'待发车(' + tabs?.receivedQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'运输中(' + tabs?.cancelQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'待签收(' + tabs?.signQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已完成(' + tabs?.compolatelQuantity + ')'"></nz-tab>
<nz-tab [nzTitle]="'已取消(' + tabs?.deltQuantity + ')'"></nz-tab>
</nz-tabset>
<div style="margin-top: 15px;">
<st #st [bordered]="true" [scroll]="{ x: '2000px' }" [data]="service.$api_get_wholePage" [columns]="columns"
<div style="margin-top: 15px">
<st
#st
[bordered]="true"
[scroll]="{ x: '2000px' }"
[data]="service.$api_get_wholePage"
[columns]="columns"
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[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">
[loading]="service.http.loading"
>
<ng-template st-row="driverName" let-item let-index="index">
<div> {{ item?.driverName }}/{{ item?.driverTelephone }}/{{ item?.driverLicenseCarNo }} </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="billExpenseDetailVOList2" let-item let-index="index">
<div *ngIf="item.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item.billExpenseDetailVOList">
{{ data.costCodeLabel }}：{{ data.price | currency }}
</p>
<p *ngFor="let data of item.billExpenseDetailVOList"> {{ 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 | currency}}
{{ data.costCodeLabel }}：{{ data.price | currency }}
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
<ng-template st-row="wayBillCode" let-item let-index="index">
<a [routerLink]="'vehicle-detail/'+item.id">{{item.wayBillCode}}</a>
<a [routerLink]="'vehicle-detail/' + item.id">{{ item.wayBillCode }}</a>
<div>
<span *ngIf="item?.wayBillStatus == 1">待接单</span>
<span *ngIf="item?.wayBillStatus == 2">待发车</span>
<span *ngIf="item?.wayBillStatus == 3">运输中</span>
<span *ngIf="item?.wayBillStatus == 4">待签收</span>
<span *ngIf="item?.wayBillStatus == 5">已完成</span>
<span *ngIf="item?.wayBillStatus == 6">已取消</span>
<span>{{item?.wayBillStatusLabel}}</span>
</div>
<div>
<span >{{item?.resourceTypeLabel}}{{item?.serviceTypeLabel}}</span>
</div>
</ng-template>
<ng-template st-row="wayBill" let-item let-index="index">
<a [routerLink]="'/vehicle-detail/'+item.id">{{item.billCode}}</a>
<a [routerLink]="'/vehicle-detail/' + item.id">{{ item.billCode }}</a>
</ng-template>
<ng-template st-row="goodsInfos" let-item let-index="index">
<div>{{item?.goodsInfos?.goodsName}}</div>
<div>{{item?.goodsInfos?.goodsResource}}</div>
<div>{{ item?.goodsInfos?.goodsName }}</div>
<div>{{ item?.goodsInfos?.weight }}{{ item?.goodsInfos?.volume? '/' +item?.goodsInfos?.volume : '' }}{{ item?.goodsInfos?.number ? '/' + item?.goodsInfos?.number : '' }}</div>
</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>
<div *ngIf="item?.loadingTime">装 | {{ item?.loadingTime }}</div>
<div *ngIf="item?.unloadingTime">卸 | {{ item?.unloadingTime }}</div>
</ng-template>
</st>
</div>
</nz-card>
</nz-card>

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

@ -293,7 +293,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
},
{ 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: 'billCode', width: '180px', className: 'text-left' },
{ title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-left' },
{
title: '卸货地',
@ -310,14 +310,14 @@ export class WaybillManagementVehicleComponent implements OnInit {
{
title: '承运司机',
className: 'text-left',
width: '120px',
index: 'driverName'
width: '250px',
render: 'driverName'
},
{
title: '收款人',
className: 'text-left',
width: '120px',
index: 'payeeName'
width: '200px',
render: 'payeeName',
},
{
title: '装卸货时间',