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-13 15:50:02 +08:00
parent 08617ecfa1 772090017b
commit 6fc033cc95
15 changed files with 144 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-05 15:28:42
* @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
@ -163,6 +163,7 @@
type="number"
[ngModel]="item.value"
min="0"
[max]="999999"
step="0.01"
(ngModelChange)="item.setValue($event)"
placeholder="总重量，必填"
@ -176,6 +177,7 @@
type="number"
[ngModel]="item.value"
min="0"
[max]="999999"
step="0.01"
(ngModelChange)="item.setValue($event)"
placeholder="总体积"
@ -190,6 +192,7 @@
type="number"
[ngModel]="item.value"
min="0"
[max]="999999"
step="0.01"
(ngModelChange)="item.setValue($event)"
placeholder="总车次"

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

@ -662,6 +662,8 @@ initSF4() {
acceptWeight: {
type: 'number',
title: '装货重量',
minimum:0,
maximum:99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -674,6 +676,8 @@ initSF4() {
acceptVolume: {
type: 'number',
title: '装货体积',
minimum:0,
maximum:99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -686,6 +690,8 @@ initSF4() {
settlementWeight: {
type: 'number',
title: '卸货重量',
minimum:0,
maximum:99999,
ui: {
unit: '吨',
placeholder: '请输入',
@ -698,6 +704,8 @@ initSF4() {
settlementVolume: {
type: 'number',
title: '卸货体积',
minimum:0,
maximum:99999,
ui: {
unit: '吨',
placeholder: '请输入',

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

@ -403,71 +403,71 @@ tabs = {
{
title: '订单号',
width: '180px',
className: 'text-center',
className: 'text-left',
render: 'billCode'
},
{
title: '运费明细',
width: '250px',
className: 'text-center',
className: 'text-left',
render: 'mybidDetailInfo',
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
{ title: '托运人', index: 'enterpriseProjectName', width: '120px', className: 'text-center' },
{ title: '关联运单号', index: 'wayBillCode', width: '180px', className: 'text-center' },
{ title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-center' },
{ title: '装货地', index: 'loadingAddressArr', width: '180px', className: 'text-center' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-left' },
{ title: '托运人', index: 'enterpriseProjectName', width: '120px', 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' },
{
title: '卸货地',
className: 'text-center',
className: 'text-left',
width: '180px',
index: 'unloadingAddressArr'
},
{
title: '货物信息',
className: 'text-center',
className: 'text-left',
width: '180px',
render: 'goodsName'
}, {
title: '运费单价',
className: 'text-center',
className: 'text-left',
width: '180px',
index: 'freightPrice'
},
{
title: '接单数量',
className: 'text-center',
className: 'text-left',
index: 'goodsNumber',
width: '180px',
},
{
title: '结算重量',
className: 'text-center',
className: 'text-left',
index: 'settlementWeight',
width: '100px',
},
{
title: '承运司机',
className: 'text-center',
className: 'text-left',
index: 'driverName',
width: '100px',
},
{
title: '收款人',
className: 'text-center',
className: 'text-left',
index: 'payeeName',
width: '100px',
},
{
title: '装卸货时间',
width: '180px',
className: 'text-center',
className: 'text-left',
render: 'loadingTime'
},
{
title: '创建时间',
width: '180px',
className: 'text-center',
className: 'text-left',
index: 'createTime',
},
{

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

@ -355,58 +355,58 @@ resourceStatus: any;
{
title: '订单号',
width: '200px',
className: 'text-center',
className: 'text-left',
render: 'billCode'
},
{
title: '我的出价',
width: '200px',
className: 'text-center',
className: 'text-left',
render: 'mybidInfo'
},
{
title: '运费明细',
width: '250px',
className: 'text-center',
className: 'text-left',
render: 'mybidDetailInfo',
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '170px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '170px', className: 'text-center' },
{ title: '关联运单号', index: 'wayBillCode', width: '170px', className: 'text-center' },
{ title: '货源编号', index: 'resourceCode', width: '170px', className: 'text-center' },
{ title: '装货地', index: 'loadingAddressArr', width: '170px', className: 'text-center' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '170px', 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: '卸货地',
className: 'text-center',
className: 'text-left',
width: '170px',
index: 'unloadingAddressArr'
},
{
title: '货物信息',
className: 'text-center',
className: 'text-left',
width: '170px',
render: 'goodsName'
}, {
title: '承运司机',
className: 'text-center',
className: 'text-left',
width: '120px',
render: 'driverName'
},
{
title: '收款人',
className: 'text-center',
className: 'text-left',
render: 'payeeName',
width: '100px',
},
{
title: '装卸货时间',
width: '170px',
className: 'text-center',
className: 'text-left',
render: 'loadingTime'
},
{
title: '创建时间',
className: 'text-center',
className: 'text-left',
index: 'creationTime',
width: '170px',
},

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

@ -2,7 +2,7 @@ import { preloaderFinished } from '@delon/theme';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2022-01-13 14:25:56
* @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
@ -59,6 +59,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
title: '预付',
default: info.prePay?.price || 0,
minimum:0,
maximum:99999,
readOnly: info.prePay?.paymentStatus === '2' || info.prePay?.paymentStatus === '4',
ui: {
prefix: '￥',
@ -72,6 +73,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
title: '到付',
default: info.toPay?.price || 0,
minimum:0,
maximum:99999,
readOnly: info.toPay?.paymentStatus === '2' || info.toPay?.paymentStatus === '4',
ui: {
prefix: '￥',
@ -96,6 +98,7 @@ export class VehicleUpdateFreightComponent implements OnInit {
receiptPay: {
type: 'number',
title: '回单付',
maximum:99999,
default: info.receiptPay?.price || 0,
minimum:0,
readOnly: info.receiptPay?.paymentStatus === '2' || info.receiptPay?.paymentStatus === '4',

10
src/app/routes/supply-goods/components/carload/carload.component.ts
View File

@ -2,7 +2,7 @@
* @Description:
* @Author: wsm
* @Date: 2021-07-15 09:42:57
* @LastEditTime: 2021-12-01 19:59:38
* @LastEditTime: 2022-01-13 15:26:51
* @LastEditors: Please set LastEditors
* @Reference:
*/
@ -113,6 +113,8 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi
contactsName: {
title: '预付',
type: 'string',
minimum:0,
maximum:99999,
ui: {
showRequired: false,
},
@ -120,6 +122,8 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi
unifiedSocialCreditCode: {
title: '到付',
type: 'string',
minimum:0,
maximum:99999,
ui: {
showRequired: false,
},
@ -127,6 +131,8 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi
unifiedSocialCreditCode2: {
title: '油卡',
type: 'string',
minimum:0,
maximum:99999,
ui: {
showRequired: false,
},
@ -134,6 +140,8 @@ export class SupplyGoodsComponentListCarloadComponent implements OnInit, AfterVi
unifiedSocialCreditCode3: {
title: '回单付',
type: 'string',
minimum:0,
maximum:99999,
ui: {
showRequired: false,
},

27
src/app/routes/supply-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-12 10:21:40
* @LastEditTime: 2022-01-13 15:16:07
* @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\bulk\bulk.component.html
@ -73,42 +73,37 @@
[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">
<div class="mr-xs" >{{item.freightPrice | currency}}
</div>
</ng-template>
<!--货源编号 -->
<ng-template st-row="resourceCode" let-item let-index="index">
<a [routerLink]="'/supply-management/bulk-detail/'+item.id">{{item?.resourceCode}}</a>
</ng-template>
<!-- 服务类型 -->
<ng-template st-row="serviceType" let-item let-index="index">
<div *ngIf="item.serviceType === 1">抢单</div>
<div *ngIf="item.serviceType === 2">指派</div>
</ng-template>
<!-- 关联订单 -->
<ng-template st-row="orderSn" let-item let-index="index">
<div *ngFor="let item of item?.wayBillClassifiedStatisticsVOList">
<label>{{item.wayBillStatusLabel}}</label>
(<span [ngStyle]="{ color:item?.count>0?'#1890FF':''}">{{item?.count}}</span>)
</div>
</ng-template>
<!-- 货物信息 -->
<ng-template st-row="goodsInfos" let-item let-index="index">
<div>{{item?.goodsInfos?.goodsName}}</div>
<div>货源：{{item?.goodsInfos?.goodsResource}}</div>
</ng-template>
<!-- 用车需求 -->
<ng-template st-row="useCarDemand" let-item let-index="index">
<div>车型: {{item.carModelLabel}}</div>
<div class="error">车长: {{item.carLenghtLabel}} 米</div>
</ng-template>
<ng-template st-row="demand" let-item let-index="index">
<div>车型: {{item.progress}}</div>
<div class="error">车长: {{item.progress}} 米</div>
</ng-template>
<ng-template st-row="price" let-item let-index="index">
<div>{{item.progress}} 元/顿</div>
</ng-template>
<ng-template st-row="cMember" let-item let-index="index">
<div>{{item.owner}}</div>
<div>{{item.mobile}}</div>
</ng-template>
<ng-template st-row="dispatcher" let-item let-index="index">
<div>{{item.owner}}</div>
<div>{{item.mobile}}</div>
</ng-template>
</st>
</div>
</nz-card>

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

@ -194,46 +194,47 @@ export class SupplyManagementBulkComponent implements OnInit {
{
title: '货源编号',
width: '200px',
className: 'text-center',
className: 'text-left',
render: 'resourceCode'
},
{ title: '服务类型', index: 'serviceTypeLabel', width: '150px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '200px', className: 'text-center' },
{ title: '项目名称', index: 'enterpriseProjectName', width: '200px', className: 'text-center' },
{ title: '关联订单', render: 'orderSn', width: '200px', className: 'text-center' },
{ title: '货物信息', render: 'goodsInfos', width: '200px', className: 'text-center' },
{ 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: '关联订单', render: 'orderSn', width: '200px', className: 'text-left' },
{ title: '货物信息', render: 'goodsInfos', width: '200px', className: 'text-left' },
{
title: '装货地',
className: 'text-center',
className: 'text-left',
index: 'loadingAddressArr',
width: '200px',
}, {
title: '卸货地',
className: 'text-center',
className: 'text-left',
index: 'unloadingAddressArr',
width: '200px',
},
{
title: '用车需求',
className: 'text-center',
className: 'text-left',
width: '200px',
render: 'useCarDemand'
},
{
title: '运费单价',
className: 'text-center',
className: 'text-right',
width: '150px',
index: 'freightPrice',
render: 'freightPrice'
},
{
title: '结算依据',
className: 'text-center',
className: 'text-left',
width: '200px',
index: 'settlementBasis',
index: 'settlementBasisLabel',
},
{
title: '货源状态',
className: 'text-center',
className: 'text-left',
index: 'resourceStatus',
type: 'badge',
width: '120px',
@ -245,18 +246,18 @@ export class SupplyManagementBulkComponent implements OnInit {
{
title: '截止时间',
width: '170px',
className: 'text-center',
className: 'text-left',
index: 'deadlineTime',
},
{
title: '发布时间',
width: '170px',
className: 'text-center',
className: 'text-left',
index: 'releaseTime',
},
{
title: '审核状态',
className: 'text-center',
className: 'text-left',
index: 'auditStatus',
type: 'badge',
width: '170px',

9
src/app/routes/supply-management/components/vehicle/vehicle.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-22 11:28:28
* @LastEditTime: 2022-01-05 15:45:01
* @LastEditTime: 2022-01-13 15:02:42
* @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
@ -57,8 +57,11 @@
<p>{{item.resourceTypeLabel}}{{item.serviceTypeLabel}}</p>
</ng-template>
<ng-template st-row="totalAmount" let-item let-index="index">
<!-- [nzPopoverContent]="contentTemplate" -->
<div class="mr-xs" nzPopoverTitle="Title" nz-popover>￥{{item.totalAmount}}
<div class="mr-xs" >{{item.totalAmount | currency}}
</div>
</ng-template>
<ng-template st-row="surcharge" let-item let-index="index">
<div class="mr-xs" >{{item.surcharge | currency}}
</div>
</ng-template>
<ng-template st-row="useCarDemand" let-item let-index="index">

34
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -358,75 +358,75 @@ export class SupplyManagementVehicleComponent implements OnInit {
{
title: '货源编号',
width: '180px',
className: 'text-center',
className: 'text-left',
render: 'resourceCode'
},
{
title: '货主',
index: 'shipperAppUserName',
width: '180px',
className: 'text-center' },
className: 'text-left' },
{
title: '项目名称',
index: 'enterpriseProjectName',
width: '180px',
className: 'text-center'
className: 'text-left'
},
{
title: '装货地',
index: 'loadingAddressArr',
width: '200px',
className: 'text-center'
className: 'text-left'
},
{
title: '卸货地',
index: 'unloadingAddressArr',
width: '200px',
className: 'text-center'
className: 'text-left'
},
{
title: '货物名称',
index: 'goodsName',
width: '150px',
className: 'text-center'
className: 'text-left'
},
{
title: '货物数量',
width: '200px',
index: 'goodsNumber',
className: 'text-center',
className: 'text-left',
format: item => item.goodsNumber.join('/')
},
{
title: '用车需求',
className: 'text-center',
width: '120px',
className: 'text-left',
width: '180px',
render: 'useCarDemand'
},
{
title: '总费用',
className: 'text-center',
className: 'text-right',
width: '120px',
index: 'totalAmount',
render: 'totalAmount'
},
{
title: '总运费',
width: '120px',
className: 'text-center',
width: '150px',
className: 'text-right',
index: 'totalAmount',
render: 'totalAmount'
},
{
title: '附加费',
className: 'text-center',
className: 'text-right',
width: '120px',
index: 'surcharge',
format: item => `￥${item.surcharge}`
render: 'surcharge'
},
{
title: '货源状态',
className: 'text-center',
className: 'text-left',
index: 'resourceStatus',
type: 'badge',
width: '120px',
@ -439,12 +439,12 @@ export class SupplyManagementVehicleComponent implements OnInit {
title: '创建时间',
width: '170px',
index: 'createTime',
className: 'text-center',
className: 'text-left',
type: 'date'
},
{
title: '审核状态',
className: 'text-center',
className: 'text-left',
index: 'auditStatus',
type: 'badge',
width: '170px',

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-11-29 15:22:34
* @LastEditTime: 2022-01-12 14:18:32
* @LastEditTime: 2022-01-13 15:38:54
* @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\usercenter\components\freight\list\list.component.html
@ -50,13 +50,13 @@
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs'>
<nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'待审核'"></nz-tab>
<nz-tab [nzTitle]="'未提交'"></nz-tab>
<nz-tab [nzTitle]="'审核通过'"></nz-tab>
<nz-tab [nzTitle]="'驳回'"></nz-tab>
</nz-tabset>
<st
#st
[bordered]="true"
[scroll]="{ x: '1200px' }"
[columns]="columns"
[data]='service.$api_get_userCarLicense_list'
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"

29
src/app/routes/vehicle/components/audit/audit.component.ts
View File

@ -37,12 +37,10 @@ export class VehicleComponentsAuditComponent implements OnInit {
if(this.resourceStatus === 1) {
a.approvalStatus = 10
} else if(this.resourceStatus === 2) {
a.approvalStatus = -1
} else if(this.resourceStatus === 3) {
a.approvalStatus = 20
} else if(this.resourceStatus === 4) {
} else if(this.resourceStatus === 3) {
a.approvalStatus = 30
}
}
return {
...a,
...this.sf?.value,
@ -155,16 +153,17 @@ export class VehicleComponentsAuditComponent implements OnInit {
initST() {
this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '车牌号', className: 'text-center', index: 'carNo' },
{ title: '车牌颜色', className: 'text-center', index: 'carNoColorLabel' },
{ title: '车型-车长-载重', className: 'text-center', render: 'carLength' },
{ title: '是否挂靠', className: 'text-center', render: 'isSelf' },
{ title: '所有人', className: 'text-center', index: 'carOwner' },
{ title: '录入人员', className: 'text-center', index: 'saveUser', },
{ title: '车牌号', width:'180px', className: 'text-center', index: 'carNo' },
{ title: '车牌颜色', width:'180px', className: 'text-center', index: 'carNoColorLabel' },
{ title: '车型-车长-载重', width:'180px',className: 'text-center', render: 'carLength' },
{ title: '是否挂靠', width:'180px', className: 'text-center', render: 'isSelf' },
{ title: '所有人', width:'180px', className: 'text-center', index: 'carOwner' },
{ title: '录入人员', width:'180px', className: 'text-center', index: 'saveUser', },
{
title: '审核状态',
className: 'text-center',
index: 'approvalStatus',
width:'180px',
type: 'badge',
badge: {
'-1': { text: '未上传', color: 'default' },
@ -176,11 +175,12 @@ export class VehicleComponentsAuditComponent implements OnInit {
40: { text: '证件过期', color: 'error' },
},
},
{ title: '申请时间', className: 'text-center', index: 'createTime' },
{ title: '申请时间', width:'180px', className: 'text-center', index: 'createTime' },
{
title: '操作',
width: '170px',
className: 'text-center',
fixed: 'right',
width: '100px',
className: 'text-left',
buttons: [
{
text: '查看',
@ -194,10 +194,7 @@ export class VehicleComponentsAuditComponent implements OnInit {
];
}
selectChange(e: number) {
console.log(e);
if(e>=1) {
this.resourceStatus = e;
}
this.initST();
setTimeout(() => {
this.st.load();

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-11-29 15:22:34
* @LastEditTime: 2022-01-12 13:54:01
* @LastEditTime: 2022-01-13 15:35: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\usercenter\components\freight\list\list.component.html
@ -34,7 +34,7 @@
</div>
<div nz-col [nzSpan]="_$expand ? 24 : 6" class="text-right">
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="st?.load(1)">导出</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="export()">导出</button>
<button nz-button [disabled]="service.http.loading"(click)="resetSF()">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
@ -51,6 +51,7 @@
<st
#st
[bordered]="true"
[scroll]="{ x: '1200px' }"
[columns]="columns"
[data]='service.$api_get_operate_list'
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"

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

@ -217,10 +217,10 @@ export class VehicleComponentsListComponent implements OnInit {
initST() {
this.columns = [
// { title: '', type: 'checkbox', className: 'text-center' },
{ title: '车牌号', className: 'text-center', index: 'carNo' },
{ title: '车牌颜色', className: 'text-center', index: 'carNoColorLabel' },
{ title: '车型-车长-载重', className: 'text-center', render: 'carLength' },
{ title: '运营状态', className: 'text-center', index: 'carStatus',
{ title: '车牌号', width:'150px', className: 'text-center', index: 'carNo' },
{ title: '车牌颜色', width:'150px', className: 'text-center', index: 'carNoColorLabel' },
{ title: '车型-车长-载重',width:'150px', className: 'text-center', render: 'carLength' },
{ title: '运营状态',width:'150px', className: 'text-center', index: 'carStatus',
type: 'badge',
badge: {
true: { text: '运输中', color: 'success' },
@ -229,6 +229,7 @@ export class VehicleComponentsListComponent implements OnInit {
},
{
title: '行驶证到期状态',
width:'180px',
className: 'text-center',
index: 'driverLicenseStatus',
type: 'badge',
@ -240,6 +241,7 @@ export class VehicleComponentsListComponent implements OnInit {
},
{
title: '道运证到期状态',
width:'180px',
className: 'text-center',
index: 'roadTransportStatus',
type: 'badge',
@ -249,15 +251,16 @@ export class VehicleComponentsListComponent implements OnInit {
3: { text: '已到期', color: 'error' },
},
},
{ title: '所有人', className: 'text-center', index: 'carOwner' },
{ title: '是否挂靠', className: 'text-center', render: 'isSelf', },
{ title: '挂靠协议', className: 'text-center', render: 'approvalAuditStatus' },
{ title: '所有人',width:'150px', className: 'text-center', index: 'carOwner' },
{ title: '是否挂靠', width:'150px', className: 'text-center', render: 'isSelf', },
{ title: '挂靠协议', width:'150px', className: 'text-center', render: 'approvalAuditStatus' },
// { title: '是否已备案', className: 'text-center', render: 'putOnRecord', },
{
title: '操作',
width: '170px',
className: 'text-center',
fixed: 'right',
width: '100px',
className: 'text-left',
buttons: [
{
text: '查看',
@ -294,4 +297,8 @@ export class VehicleComponentsListComponent implements OnInit {
this.sf.reset();
this._$expand = false;
}
// 导出
export() {
this.service.downloadFile(this.service.$api_carLicense_export, this.reqParams );
}
}

5
src/app/routes/vehicle/services/vehicle.service.ts
View File

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-11-29 15:22:34
* @LastEditTime: 2021-12-17 17:17:17
* @LastEditTime: 2022-01-13 15:37: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\usercenter\services\usercenter.service.ts
@ -50,6 +50,9 @@ export class VehicleService extends BaseService {
// 根据车牌号查询车辆信息（车辆审核认证表）
$api_get_getCarLicenseListByCarNo_audit= `/api/mdc/cuc/carLicenseAudit/operate/findCarLicenseAuditListByCarNo`;
// 导出（车辆认证表）
$api_carLicense_export= `/api/mdc/cuc/carLicense/operate/export`;
constructor(public injector: Injector) {