From 2e0096b03bf93c31d6719e2580698a54431caeff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=BD=98=E6=99=93=E4=BA=91?= Date: Wed, 13 Apr 2022 17:01:22 +0800 Subject: [PATCH 1/2] - --- .../components/order-reporting/order-reporting.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts index c50cb454..84da77ee 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.ts @@ -29,7 +29,7 @@ export class DatatableOrderReportingComponent implements OnInit { { name: '异常', value: '2' }, { name: '全部', value: '' } ]; - selectedIndex = '1'; + selectedIndex = '0'; isLoading: boolean = false; selectedRows: any[] = []; constructor( From f0f611f0be4f47514c3e0ba29555cee73c6d0a03 Mon Sep 17 00:00:00 2001 From: Taric Xin Date: Wed, 13 Apr 2022 17:08:27 +0800 Subject: [PATCH 2/2] edit --- .../bulk-detail/bulk-detail.component.html | 101 +++++++++--------- .../bulk-detail/bulk-detail.component.ts | 6 +- .../vehicle-detail.component.html | 83 ++++++-------- .../vehicle-detail.component.ts | 12 ++- .../services/order-management.service.ts | 1 + 5 files changed, 97 insertions(+), 106 deletions(-) diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 3380fdbe..2d5a6958 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -15,26 +15,18 @@ -
+

订单号: {{ i?.billCode }}

-
- - + acl [acl-ability]="['ORDER-BULK-DETAIL-cancelAnOrder']">取消订单 +
@@ -43,8 +35,9 @@ {{ i?.goodsResource?.shipperAppUserName }} {{ i?.goodsResource?.enterpriseProjectName }} {{ i?.goodsResource?.serviceTypeLabel }} - {{ i?.createUserName }} {{ i?.createUserPhone ? "/" + i?.createUserPhone : ''}} - {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? "/" + i?.goodsResource?.dispatchPhone : ''}} + {{ i?.createUserName }} {{ i?.createUserPhone ? "/" + i?.createUserPhone : ''}} + {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? "/" + + i?.goodsResource?.dispatchPhone : ''}} {{ i?.goodsResource?.resourceCode }} {{ i?.wayBill?.wayBillCode }} {{ i?.goodsResource?.paymentDays }} @@ -64,12 +57,8 @@
  - +
@@ -82,9 +71,11 @@ - {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 {{ i?.carModel }}{{ i?.carLength ? "/" + i?.carLength : ''}} - {{ i?.driverName }}{{i?.driverPhone ? "/" + i?.driverPhone : ''}}{{ i?.carNo ? "/" + i?.carNo : ''}} + {{ i?.driverName }}{{i?.driverPhone ? "/" + i?.driverPhone : ''}}{{ i?.carNo ? "/" + i?.carNo : + ''}} {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 {{ i?.acceptWeight }}吨,{{ i?.acceptVolume }}方 - {{ i?.loadWeight }}吨，{{ i?.loadVolume }}方 - {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方 + {{ i?.loadWeight }}吨，{{ + i?.loadVolume }}方 + {{ i?.settlementWeight }}吨,{{ + i?.settlementVolume }}方
-

装货卸货信息 - ( +

装货卸货信息 + ( @@ -114,7 +105,7 @@
装

装货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}

-

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : '' }}

+

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : '' }}

@@ -127,7 +118,7 @@
卸

卸货地：{{ item?.province }}{{ item.city }}{{ item.area }}{{ item.detailedAddress }}

-

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : ''}}

+

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : ''}}

@@ -137,11 +128,12 @@ -

{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' }}{{i?.ruleLabel}}）

+

{{i?.freightPrice}}{{i?.freightTypeLabel}}（{{ i?.settlementBasisLabel ? i?.settlementBasisLabel + '，' :' ' + }}{{i?.ruleLabel}}）

到付 - {{ item.price + item.surcharge | currency }} + {{ item.price + item.surcharge | currency }} {{ item.price | currency }} @@ -152,26 +144,30 @@
- 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | currency }}， + 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}%）
-
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" + i?.payeePhone : ''}}
+
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? "/" + + i?.payeePhone : ''}}
 - 查看附件      - 补充协议 + 查看附件      + 补充协议 - + - + @@ -183,7 +179,8 @@ {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} + {{ + i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} {{ i?.supplementaryInformationVO?.area }} @@ -206,11 +203,13 @@
- +
- + +
@@ -223,7 +222,7 @@ - +
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! @@ -236,17 +235,19 @@ - - + - + - +
暂无附件信息
@@ -255,4 +256,4 @@ - + \ No newline at end of file diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts index 86260c56..517cc02a 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.ts @@ -41,6 +41,10 @@ export class OrderManagementBulkeDetailComponent implements OnInit { { title: '时间', index: 'parkBte' }, { title: '地点', index: 'parkAdr' } ]; + logColumns3: STColumn[] = [ + { title: '时间', index: 'warningTime' }, + { title: '异常预警类型', index: 'warningTypeLabel' } + ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, { title: '小计（元）', render: 'prices' }, @@ -67,7 +71,7 @@ export class OrderManagementBulkeDetailComponent implements OnInit { constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, - private service: OrderManagementService, + public service: OrderManagementService, private router: Router, private modal: NzModalService ) {} diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index f9519e6c..4266efe6 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -21,22 +21,12 @@
- - + acl [acl-ability]="['ORDER-VEHICLE-DETAIL-cancelAnOrder']">取消订单 +
@@ -46,8 +36,8 @@ {{ i?.goodsResource?.enterpriseProjectName }} {{ i?.goodsResource?.serviceTypeLabel }} {{ i?.createUserName }} {{ i?.createUserPhone ? '/' + i?.createUserPhone : '' }} - {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? '/' + i?.goodsResource?.dispatchPhone : '' }} + {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? '/' + + i?.goodsResource?.dispatchPhone : '' }} {{ i?.externalBillCode }} {{ i?.goodsResource?.resourceCode }} @@ -70,13 +60,9 @@
  - + [nzStatus]="item.displayStatus === 'SHOW' ? 'finish' : 'wait'">
@@ -93,16 +79,16 @@ - {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 {{ i?.carModel }}{{ i?.carLength ? '/' + i?.carLength : '' }} - {{ i?.driverName }}{{ i?.driverPhone ? '/' + i?.driverPhone : '' }}{{ i?.carNo ? '/' + i?.carNo : '' }} + {{ i?.driverName }}{{ i?.driverPhone ? '/' + i?.driverPhone : '' }}{{ i?.carNo ? '/' + i?.carNo : + '' }} {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨
-

装货卸货信息 - ( +

装货卸货信息 + ( ) @@ -167,10 +153,12 @@
- 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | currency }}， + 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2) }}% ）
-
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' + i?.payeePhone : '' }}
+
车队长：{{ i?.payeeName }}{{ i?.payeePhone ? '/' + + i?.payeePhone : '' }}
@@ -185,7 +173,8 @@ - + + @@ -222,19 +211,13 @@
- +
- + +
@@ -258,21 +241,17 @@ - + - +
暂无附件信息
@@ -281,4 +260,4 @@ - + \ No newline at end of file diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts index db239095..b4f477e9 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.ts @@ -46,6 +46,10 @@ export class OrderManagementVehicleDetailComponent implements OnInit { { title: '时间', index: 'parkBte' }, { title: '地点', index: 'parkAdr' } ]; + logColumns3: STColumn[] = [ + { title: '时间', index: 'warningTime' }, + { title: '异常预警类型', index: 'warningTypeLabel' } + ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, { title: '小计（元）', render: 'prices' }, @@ -61,7 +65,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, - private service: OrderManagementService, + public service: OrderManagementService, private router: Router, private modal: NzModalService ) {} @@ -80,8 +84,10 @@ export class OrderManagementVehicleDetailComponent implements OnInit { markerLabel: '装', color: 'blue', position: [res.startingPoint.longitude, res.startingPoint.latitude], - title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area || ''}${res.startingPoint.detailedAddress}`, - time: '计划出发时间：' +res.loadPlanTime + title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area || ''}${ + res.startingPoint.detailedAddress + }`, + time: '计划出发时间：' + res.loadPlanTime }, { markerLabel: '卸', diff --git a/src/app/routes/order-management/services/order-management.service.ts b/src/app/routes/order-management/services/order-management.service.ts index ea53eff2..c63771cd 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -188,6 +188,7 @@ export class OrderManagementService extends ShipperBaseService { // 查询异常预警表 $api_get_abnormalWarning = `/api/sdc/abnormalWarning/list/page`; + $api_get_order_abnormalWarning = `/api/sdc/abnormalWarning/getAbnormalWarningByBillId`; // 异步导出运营后台大宗订单列表 $api_get_asyncExportBulkList = `/api/sdc/billOperate/asyncExportBulkList`;