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-12 15:10:38 +08:00
parent 50090b6971 1ca5e81dad
commit 8907373b55
22 changed files with 215 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/commom/less/box.less
View File

@ -16,8 +16,8 @@
}
.ant-tabs-tab-btn {
padding-left : 16px;
padding-right: 16px;
padding-left : 16px;
}
.text-truncate {

4
src/app/routes/commom/less/expend-but.less
View File

@ -1,13 +1,13 @@
.expend-options {
margin-top: 0px;
margin-top: 0;
}
@media (min-width: 1200px) {
.expend-options {
max-width: 450px;
position : absolute;
right : 0;
bottom : 25px;
max-width: 450px;
}
}

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

@ -199,16 +199,16 @@ tabs = {
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
payeeId: {
title: '车队长',
@ -287,18 +287,35 @@ tabs = {
asyncData: () => this.service2.getNetworkFreightForwarder(),
},
},
goodsName: {
// goodsName: {
// type: 'string',
// title: '货物名称',
// ui: {
// widget: 'select',
// placeholder: '请选择',
// visibleIf: {
// _$expand: (value: boolean) => value,
// },
// allowClear: true,
// asyncData: () => this.getCatalogueMember(),
// },
// },
goodsTypeId: {
type: 'string',
title: '货物名称',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
},
allowClear: true,
asyncData: () => this.getCatalogueMember(),
},
errors: { required: '请选择货物类型' },
asyncData: () =>
this.service2.loadConfigByKey('goods.name.config.type').pipe(
map((data: any) => {
return data[0].children?.map((m: any) => {
return { label: m.name, value: m.id };
});
})
),
} as SFSelectWidgetSchema
},
serviceType: {
title: '服务类型',
@ -640,7 +657,7 @@ tabs = {
nzComponentParams: { data: { ...data, billId: item.id } },
});
modal.afterClose.subscribe(_ => this.st.reload());
modal.afterClose.subscribe(_ => this.st.reload(1));
}
});
}
@ -691,6 +708,7 @@ tabs = {
this.st?.reload(1);
this.initST();
}
this.st?.reload(1);
}),
})
}

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-16 10:19:08
* @LastEditTime: 2022-01-12 10:42:22
* @LastEditTime: 2022-01-12 15:02: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\components\risk-detail\risk-detail.component.html
@ -29,29 +29,9 @@
<nz-card class="dealBox" nzTitle="投诉处理">
<!-- <nz-timeline class="d-block pl-md pt-md">
<nz-timeline-item *ngFor="let i of datailList" [nzDot]="dotTpl">
<ng-template #dotTpl>
<div class="md-sm p-sm icon-sm rounded-circle text-white bg-{{ i.dot.bg }}">
<i nz-icon [nzType]="i.dot.icon"></i>
</div>
</ng-template>
<div class="pl-lg">
<strong>{{ i.time }}</strong>
<div class="py-sm" [innerHTML]="i.content | html"></div>
<div class="text-grey">{{ i.tags }}</div>
</div>
</nz-timeline-item>
</nz-timeline> -->
<nz-timeline nzMode="left">
<nz-timeline-item >TMS运营管理系统
<div class="info">提交时间：{{datailList?.complainantTime}}</div>
</nz-timeline-item>
<nz-timeline-item [nzLabel]="datailList?.handleTime">运多星运营后台
<div class="info">操作人员：{{datailList?.complainantIdLabel}}</div>
<div class="info">处理状态：{{datailList?.complaintStatusLabel}}</div>
<div class="info">处理详情：{{datailList?.handleDetails}}</div>
<div class="info">处理结果：{{datailList?.handleResult}}</div>
<nz-timeline-item *ngFor="let i of datailList?.processNodeVOS" [nzLabel]="i?.time">{{i?.nodeNameLabel}}
<div class="info">{{i?.nodeName}}：{{i?.result}}</div>
</nz-timeline-item>
</nz-timeline>
</nz-card>

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

@ -213,16 +213,16 @@ resourceStatus: any;
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
payeeId: {
title: '车队长',
@ -305,13 +305,10 @@ resourceStatus: any;
type: 'string',
title: '货物名称',
ui: {
widget: 'select',
placeholder: '请选择',
visibleIf: {
_$expand: (value: boolean) => value,
},
allowClear: true,
asyncData: () => this.getCatalogueMember(),
},
},
serviceType: {
@ -621,7 +618,7 @@ resourceStatus: any;
// return false;
// }
});
modal.afterClose.subscribe(_ => this.st.reload());
modal.afterClose.subscribe(_ => this.st.reload(1));
}
});
}
@ -683,6 +680,11 @@ resourceStatus: any;
// return false;
// }
});
modal.afterClose.subscribe((result) => {
if (result) {
this.st.load(1);
}
});
}
/**
*修改网络货运人
@ -713,6 +715,11 @@ resourceStatus: any;
// return false;
// }
});
modal.afterClose.subscribe((result) => {
if (result) {
this.st.load(1);
}
});
}
// *确认签收
@ -737,7 +744,7 @@ resourceStatus: any;
console.log(res)
if(res) {
this.service.msgSrv.success('撤销成功！')
this.stFloat.reload()
this.stFloat.reload(1)
} else {
this.service.msgSrv.error(res.msg)
}
@ -754,7 +761,7 @@ resourceStatus: any;
this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => {
if (res === true) {
this.service.msgSrv.success('操作成功！');
this.st?.reload();
this.st?.reload(1);
this.initST();
}
}),
@ -772,6 +779,7 @@ resourceStatus: any;
this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
if (res) {
console.log(res);
this.st?.reload(1);
} else {
this.service.msgSrv.error(res.msg);
}

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2021-12-22 18:53:54
* @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
@ -50,10 +50,10 @@ nzMessage="签收后不可再修改运费，请确保运费等信息准确无误
<div>{{detailList?.price}} 元</div>
</sv>
<sv label="司机车辆">
<div>{{driverList?.nickName}} / {{driverList?.telephone}}/ {{carList?.carNo}}</div>
<div>{{detailList?.driverName}} / {{detailList?.driverPhone}}/ {{detailList?.carNo}}</div>
</sv>
<sv label="收款人">
<div>{{payeeList?.nickName}} / {{payeeList?.telephone}}</div>
<div>{{detailList?.payeeName}} / {{detailList?.payeePhone}}</div>
</sv>
<sv label="回单凭证">
<nz-upload

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

@ -2,7 +2,7 @@ import { preloaderFinished } from '@delon/theme';
/*
* @Author: your name
* @Date: 2021-12-14 14:03:07
* @LastEditTime: 2021-12-22 19:10:07
* @LastEditTime: 2022-01-12 14:01:08
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\modal\bulk\update-freight\update-freight.component.ts
@ -96,18 +96,6 @@ export class ConfirReceiptComponent implements OnInit {
})
});
this.listImagUrls = arr;
this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.detailList?.payeeId}).subscribe((res: any) => {
console.log(res)
this.payeeList = res;
})
this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.detailList?.driverId}).subscribe((res: any) => {
console.log(res)
this.driverList = res;
})
this.service.request(this.service.$api_getCarLicenseByIds, {id: this.detailList?.carId}).subscribe((res: any) => {
console.log(res)
this.carList = res;
})
})

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

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2021-12-21 14:34:16
* @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
@ -18,10 +18,10 @@
<st #st [widthMode]="{ type: 'strict' }" [data]="costDetail" [columns]="columns" bordered="true" [page]="{ show: false }"></st>
</sv>
<sv label="司机车辆">
<div>{{driverList?.nickName}} / {{driverList?.telephone}}/ {{carList?.carNo}}</div>
<div>{{dataInfo?.driverName}} / {{dataInfo?.driverPhone}}/ {{dataInfo?.carNo}}</div>
</sv>
<sv label="收款人">
<div>{{payeeList?.nickName}} / {{payeeList?.telephone}}</div>
<div>{{dataInfo?.payeeName}} / {{dataInfo?.payeePhone}}</div>
</sv>
<sv label="回单凭证">
<nz-upload

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

@ -1,7 +1,7 @@
/*
* @Author: your name
* @Date: 2021-12-15 13:17:42
* @LastEditTime: 2022-01-12 13:37:05
* @LastEditTime: 2022-01-12 14:01: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\modal\vehicle\confir-receipt\confir-receipt.component.ts
@ -143,19 +143,6 @@ export class VehicleConfirReceiptComponent implements OnInit {
})
});
this.listImagUrls = arr;
// this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.payeeId}).subscribe((res: any) => {
// console.log(res)
// this.payeeList = res;
// })
// this.service.request(this.service.$api_getUserDetailByAppUserId, {id: this.dataInfo?.driverId}).subscribe((res: any) => {
// console.log(res)
// this.driverList = res;
// })
// this.service.request(this.service.$api_getCarLicenseByIds, {id: this.dataInfo?.carId}).subscribe((res: any) => {
// console.log(res)
// this.carList = res;
// })
console.log(cost)
this.costDetail = [cost];
})
}

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

@ -37,7 +37,7 @@ export class OrderManagementService extends ShipperBaseService {
// 整车详情
$api_get_getWholeBillDetail = `/api/sdc/billOperate/getWholeBillDetail`;
// 根据车牌号查询车辆信息
$api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicenseAudit/operate/getCarLicenseListByCarNo`;
$api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`;
// 查询大宗订单列表
$api_get_listBulkPage = `/api/sdc/billOperate/listBulkPage`;

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 09:43:19
* @LastEditTime: 2022-01-12 14:18:32
* @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
@ -47,7 +47,7 @@
<nz-card>
<!-- 数据列表 -->
<!-- [data]="service.$api_get_supplier_page" -->
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" >
<nz-tabset (nzSelectedIndexChange)="selectChange($event)" [nzSelectedIndex]='defaultTabs'>
<nz-tab [nzTitle]="'全部'"></nz-tab>
<nz-tab [nzTitle]="'待审核'"></nz-tab>
<nz-tab [nzTitle]="'未提交'"></nz-tab>

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

@ -13,6 +13,7 @@ import { VehicleService } from '../../../vehicle/services/vehicle.service';
export class VehicleComponentsAuditComponent implements OnInit {
_$expand = false;
resourceStatus: any;
defaultTabs = 1;
ui!: SFUISchema;
schema!: SFSchema;
columns!: STColumn[];
@ -80,26 +81,24 @@ export class VehicleComponentsAuditComponent implements OnInit {
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 250,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
return this.service
.request(this.service.$api_get_getCarLicenseListByCarNo_audit, {
.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.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
} as SFSelectWidgetSchema,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
carNoColor: {
type: 'string',

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

@ -77,7 +77,7 @@ export class VehicleComponentsListComponent implements OnInit {
ui: {
widget: 'select',
serverSearch: true,
searchDebounceTime: 250,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
onSearch: (q: any) => {
if (!!q) {
@ -85,18 +85,16 @@ export class VehicleComponentsListComponent 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.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
} as SFSelectWidgetSchema,
visibleIf: {
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
carNoColor: {
type: 'string',

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

@ -166,7 +166,7 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
}
} as SFSelectWidgetSchema
},
customerCode: {
carNo: {
title: '车牌号',
type: 'string',
ui: {
@ -180,16 +180,16 @@ export class WaybillManagementAbnormalAppearComponent implements OnInit {
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
reportingTime: {
title: '上报时间',

9
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: 2021-12-28 10:01:51
* @LastEditTime: 2022-01-12 14:53:26
* @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
@ -69,8 +69,11 @@
</div>
</ng-template>
<ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
<div *ngFor="let i of item?.billExpenseDetailVOList; let ii = index">
<span >{{i?.costName}}：{{i?.price}}</span>
<div *ngIf="item.billExpenseDetailVOList.length > 0">
<p *ngFor="let data of item.billExpenseDetailVOList">
{{ data.costCodeLabel }}：{{ data.price }}
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
<ng-template st-row="wayBill" let-item let-index="index">

6
src/app/routes/waybill-management/components/bulk/bulk.component.less
View File

@ -1,3 +1,8 @@
:host ::ng-deep{
::ng-deep nz-range-picker{
width: 100%;
}
.left_btn {
width: 50px;
height: 32px;
@ -5,3 +10,4 @@
line-height:32px;
background-color: #d7d7d7;
}
}

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

@ -161,16 +161,16 @@ tabs = {
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
}
},
visibleIf: {
_$expand: (value: boolean) => value,
},
} as SFSelectWidgetSchema,
_$expand: (value: boolean) => value
}
} as SFSelectWidgetSchema
},
payeeId: {
title: '车队长',
@ -261,18 +261,25 @@ tabs = {
},
} as SFSelectWidgetSchema,
},
goodsName: {
goodsNameId: {
type: 'string',
title: '货物名称',
ui: {
widget: 'select',
placeholder: '请选择',
errors: { required: '请选择货物类型' },
visibleIf: {
_$expand: (value: boolean) => value,
},
allowClear: true,
asyncData: () => this.getCatalogueMember(),
_$expand: (value: boolean) => value
},
asyncData: () =>
this.service2.loadConfigByKey('goods.name.config.type').pipe(
map((data: any) => {
return data[0].children?.map((m: any) => {
return { label: m.name, value: m.id };
});
})
),
} as SFSelectWidgetSchema
},
serviceType: {
title: '服务类型',
@ -343,25 +350,25 @@ tabs = {
{ title: '', type: 'checkbox', width: '50px', className: 'text-center' },
{
title: '运单号',
width: '100px',
width: '180px',
className: 'text-center',
render: 'wayBillCode'
},
{
title: '运费明细',
width: '100px',
width: '150px',
className: 'text-center',
render: 'billExpenseDetailVOList'
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '120px', className: 'text-center' },
{ title: '关联订单号', render: 'wayBill', width: '120px', className: 'text-center' },
{ title: '货源编号', index: 'resourceCode', width: '120px', className: 'text-center' },
{ title: '装货地', index: 'loadingPlace', width: '120px', className: 'text-center' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '180px', className: 'text-center' },
{ title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-center' },
{ title: '货源编号', index: 'resourceCode', width: '180px', className: 'text-center' },
{ title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-center' },
{
title: '卸货地',
className: 'text-center',
width: '120px',
width: '180px',
index: 'dischargePlace'
},
{
@ -409,7 +416,7 @@ tabs = {
},
{
title: '创建时间',
width: '130px',
width: '180px',
className: 'text-center',
index: 'createTime',
},

19
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: 2021-12-22 11:31:50
* @LastEditTime: 2022-01-12 14:51:05
* @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
@ -52,10 +52,25 @@
[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="billExpenseDetailVOList" let-item let-index="index">
<!-- <ng-template st-row="billExpenseDetailVOList" let-item let-index="index">
<div *ngFor="let i of item?.billExpenseDetailVOList; let ii = index">
<span>{{i?.costName}}：{{i?.price}}</span>
</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 }}
</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 }}
<span style="color: #f59a63">{{ data.paymentStatusLabel }}</span>
</p>
</div>
</ng-template>
<ng-template st-row="wayBillCode" let-item let-index="index">
<a [routerLink]="'/waybill-management/vehicle-detail/'+item.id">{{item.wayBillCode}}</a>

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

@ -1,2 +1,5 @@
:host {
:host ::ng-deep{
::ng-deep nz-range-picker{
width: 100%;
}
}

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

@ -102,9 +102,6 @@ export class WaybillManagementVehicleComponent implements OnInit {
serverSearch: true,
searchDebounceTime: 300,
searchLoadingText: '搜索中...',
visibleIf: {
_$expand: (value: boolean) => value
},
onSearch: (q: any) => {
console.log(q)
if (!!q) {
@ -173,7 +170,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
.request(this.service.$api_get_getCarLicenseListByCarNo, {
carNo: q
})
.pipe(map((res: any[]) => (res 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.carNo } as SFSchemaEnum))))
.toPromise();
} else {
return of([]);
@ -260,19 +257,36 @@ export class WaybillManagementVehicleComponent implements OnInit {
asyncData: () => this.service2.getNetworkFreightForwarder()
}
},
goodsName: {
// goodsName: {
// type: 'string',
// title: '货物名称',
// ui: {
// placeholder: '请选择',
// visibleIf: {
// _$expand: (value: boolean) => value
// },
// }
// }
goodsNameId: {
type: 'string',
title: '货物名称',
ui: {
widget: 'select',
placeholder: '请选择',
errors: { required: '请选择货物类型' },
visibleIf: {
_$expand: (value: boolean) => value
},
allowClear: true,
asyncData: () => this.getCatalogueMember()
}
}
asyncData: () =>
this.service2.loadConfigByKey('goods.name.config.type').pipe(
map((data: any) => {
return data[0].children?.map((m: any) => {
return { label: m.name, value: m.id };
});
})
),
} as SFSelectWidgetSchema
},
},
type: 'object'
};
@ -293,31 +307,31 @@ export class WaybillManagementVehicleComponent implements OnInit {
},
{
title: '货主出价',
width: '100px',
width: '250px',
className: 'text-center',
index: 'resourceCode'
render: 'billExpenseDetailVOList2'
},
{
title: '货源编号',
width: '100px',
width: '150px',
className: 'text-center',
index: 'resourceCode'
},
{
title: '运费明细',
width: '100px',
title: '费用明细',
width: '250px',
className: 'text-center',
render: 'billExpenseDetailVOList'
},
{ title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '120px', className: 'text-center' },
{ title: '关联订单号', render: 'wayBill', width: '120px', className: 'text-center' },
{ title: '装货地', index: 'loadingAddressArr', width: '120px', className: 'text-center' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '180px', className: 'text-center' },
{ title: '货主', index: 'shipperAppUserName', width: '150px', className: 'text-center' },
{ title: '关联订单号', render: 'wayBill', width: '180px', className: 'text-center' },
{ title: '装货地', index: 'loadingPlace', width: '180px', className: 'text-center' },
{
title: '卸货地',
className: 'text-center',
width: '120px',
index: 'unloadingAddressArr'
width: '180px',
index: 'dischargePlace'
},
{
title: '货物信息',
@ -345,7 +359,7 @@ export class WaybillManagementVehicleComponent implements OnInit {
},
{
title: '创建时间',
width: '130px',
width: '180px',
className: 'text-center',
index: 'createTime'
},

4
src/app/routes/waybill-management/services/waybill-management.service.ts
View File

@ -2,7 +2,7 @@ import { WaybillManagementBulkComponent } from './../components/bulk/bulk.compon
/*
* @Author: your name
* @Date: 2021-12-07 14:52:29
* @LastEditTime: 2022-01-11 19:07:29
* @LastEditTime: 2022-01-12 14:34:04
* @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\waybill-management\services\waybill-management.service.ts
@ -35,7 +35,7 @@ export class WaybillManagementServe extends BaseService {
$api_get_getBulkStatistics = `/api/sdc/wayBillOperate/getBulkStatistics`;
// 根据车牌号查询车辆信息
$api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicenseAudit/operate/getCarLicenseListByCarNo`;
$api_get_getCarLicenseListByCarNo= `/api/mdc/cuc/carLicense/findCarLicenseByCarNo`;
// 大宗确认发车
$api_get_insertBulkStartCarInfo= `/api/sdc/wayBillOperate/insertBulkStartCarInfo`;

1
src/app/shared/services/business/shipper-base.service.ts
View File

@ -140,6 +140,7 @@ export class ShipperBaseService extends BaseService {
getNetworkTransporterById(id: string) {
return this.request(this.$api_get_network_freight_forwarder_one, { id });
}
// 根据FullKey获取系统子配置(树)
loadConfigByKey(configFullKey:string ='') {
return this.http.post(this.$api_getSysConfigTreeByParentFullKey, { configFullKey }).pipe(