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 lxx

Browse Source
This commit is contained in:
xiaoxing.liu
2022-04-09 17:21:21 +08:00
parent 57093aa400 5fe34208af
commit 64492576aa
13 changed files with 107 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,7 +99,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
ui: {
}
},
wayCode: {
wayBillCode: {
type: 'string',
title: '运单号',
ui: {
@ -213,13 +213,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
*/
initST() {
this.columns = [
{
title: '运单号',
width: '180px',
fixed: 'left',
className: 'text-left',
index: 'wayCode'
},
{
title: '订单号',
width: '180px',
@ -227,6 +220,13 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
className: 'text-left',
index: 'billCode'
},
{
title: '运单号',
width: '180px',
fixed: 'left',
className: 'text-left',
index: 'wayCode'
},
{ title: '服务类型', index: 'serviceTypeLabel', width: '220px', className: 'text-left',format: (item) => {
return item?.resourceTypeLabel + item?.serviceTypeLabel
} },
@ -285,6 +285,6 @@ export class OrderManagementAbnormalWarningComponent implements OnInit {
// 导出
exprot() {
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_get_asyncExportSpotCheckList);
this.service.exportStart({ ...this.reqParams, pageSize: -1 }, this.service.$api_abnormalWarning_asyncExport);
}
}

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

@ -4,7 +4,7 @@
* @Author : Shiming
* @Date : 2021-12-03 15:31:52
* @LastEditors : Shiming
* @LastEditTime : 2022-04-07 09:49:44
* @LastEditTime : 2022-04-09 16:16:09
* @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts
* Copyright (C) 2022 huzhenhong. All rights reserved.
*/
@ -200,6 +200,8 @@ export class OrderManagementService extends ShipperBaseService {
$api_get_asyncExportSpotCheckList= `/api/sdc/BillComplianceSpotCheck/asyncExportSpotCheckList`;
// 异步导出单据审核导出
$api_get_asyncExportExamineBillList= `/api/sdc/billExamine/asyncExportExamineBillList`;
// 异步导出单据审核导出
$api_abnormalWarning_asyncExport= `/api/sdc/abnormalWarning/asyncExport`;
/**
* 根据企业ID，获取企业历史网络货运人
* @returns