diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html index 0dd45250..0d42260f 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 20:22:48 + * @LastEditTime : 2022-01-20 20:32:44 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -70,13 +70,14 @@ -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
+
-
-
+
+
装货地 @@ -84,36 +85,50 @@ -
联系人 - -
- - -
- +
+ + + + + + +
-
+
-
-
+
+
卸货地 @@ -121,37 +136,65 @@ -
联系人 - -
- - -
- +
+ + + + + + +
-
-
-

计划装货时间：{{i?.loadPlanTime}}

+
+
+ + 装货时间 + + + +
-
-

计划卸货时间：{{i?.unloadPlanTime}}

+
+
+ + 卸货时间 + + + +
- + diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.less b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.less index 0eb3feb0..a59b9526 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.less +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.less @@ -1,86 +1,33 @@ :host { - .btn-size { - font-size: 14px; - } - - .bdr { - border-right: 1px solid #ccc; - } - - .bdl { - border-left: 1px solid #ccc; - } - - .source-info { - p { - margin-bottom: .5em; - } - } - - .freight-info-box { - width: 95%; - } - - .freigth-label { - display : inline-block; - width : 50px; - text-align: right; - } - - ::ng-deep { - .approval-status { - .ant-steps { - width : 70%; - margin: 0 auto; - } - } - - .ant-tabs-top>.ant-tabs-nav, - .ant-tabs-bottom>.ant-tabs-nav, - .ant-tabs-top>div>.ant-tabs-nav, - .ant-tabs-bottom>div>.ant-tabs-nav { - margin: 0; - } - - .ant-anchor-ink::before { - width: 0; - } - - .ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - .ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - .ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - .ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab { - margin-left: 40px - } - } - - .leftPadding { - padding-right: 100px; - } .tip-font { margin-left: 16px; font-weight: 500; - font-size : 12px; - } - - .card-title { + font-size: 12px; + } + + .card-title { margin-bottom: 24px; - font-weight : bold; - font-size : 16px; - } - - .align-center { - display : flex; - align-items : center; + font-weight: bold; + font-size: 16px; + } + + .align-center { + display: flex; + align-items: center; justify-content: center; - } - - #container { - width : 300px; + } + .align-center2 { + display: flex; + align-items: center; + } + #container { + width: 300px; height: 180px; - } - .ant-col-10 { - flex: none; - } + } + :host { + ::ng-deep { + nz-input-number{width: 100%;} + } + } } \ No newline at end of file diff --git a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts index 0fb5d16d..d5ca8f89 100644 --- a/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts +++ b/src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 20:21:35 + * @LastEditTime : 2022-01-20 20:34:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -507,46 +507,45 @@ loadTime: any; // 货源单设置回显 } // -------------------装卸货信息处理 // 打开地图 - openMap(type: string, index: number) { - const modalRef = this.modalService.create({ - nzTitle: '', - nzContent: AmapPoiPickerComponent, - nzWidth: 900, - nzOnOk: item => { - const poi = item.poi; - const locList = poi.pois; - switch (type) { - case 'start': - this.startInfo[index].detailedAddress = poi.formattedAddress; - this.startInfo[index].longitude = locList[0]; - this.startInfo[index].latitude = locList[1]; - this.startInfo[index].province = poi.addressComponent.province; - this.startInfo[index].city = poi.addressComponent.city; - this.startInfo[index].area = poi.addressComponent.district; - this.startInfo[index].address = poi.formattedAddress; - break; - case 'end': - this.endInfo[index].detailedAddress = poi.formattedAddress; - this.endInfo[index].longitude = locList[0]; - this.endInfo[index].latitude = locList[1]; - this.endInfo[index].province = poi.addressComponent.province; - this.endInfo[index].city = poi.addressComponent.city; - this.endInfo[index].area = poi.addressComponent.district; - this.endInfo[index].address = poi.formattedAddress; - break; - default: - break; - } + // 打开地图 + openMap(type: string, index: number) { + const modalRef = this.modalService.create({ + nzTitle: '', + nzContent: AmapPoiPickerComponent, + nzWidth: 900, + nzOnOk: item => { + const poi = item.poi; + const locList = poi.pois; + switch (type) { + case 'start': + this.startInfo[index].detailedAddress = poi.formattedAddress; + this.startInfo[index].longitude = locList[0]; + this.startInfo[index].latitude = locList[1]; + this.startInfo[index].province = poi.addressComponent.province; + this.startInfo[index].city = poi.addressComponent.city; + this.startInfo[index].area = poi.addressComponent.district; + break; + case 'end': + this.endInfo[index].detailedAddress = poi.formattedAddress; + this.endInfo[index].longitude = locList[0]; + this.endInfo[index].latitude = locList[1]; + this.endInfo[index].province = poi.addressComponent.province; + this.endInfo[index].city = poi.addressComponent.city; + this.endInfo[index].area = poi.addressComponent.district; + break; + default: + break; + } - if (this.startInfo[0]?.area && this.endInfo[0]?.area) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe((res: any) => { - this.totalDistance = res.distance; - this.totalTime = res.time; - }); + if (this.startInfo[0]?.area && this.endInfo[0]?.area) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } } - } - }); -} + }); + } initSF3() { this.schema3 = { diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html index 3b69e65e..c5430704 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-23 13:39:58 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 20:23:52 + * @LastEditTime : 2022-01-20 20:28:15 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -65,8 +65,8 @@ >
-
-
+
+
装货地 @@ -74,42 +74,51 @@ - +
联系人 - -
- +
+ + + + -
- + +
-
+
-
-
+
+
卸货地 @@ -117,43 +126,46 @@ - +
联系人 - -
- +
+ + + + -
- + +
-
-
-

计划装货时间：{{ i?.loadPlanTime }}

-
-
-

计划卸货时间：{{ i?.unloadPlanTime }}

-
-
- + diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.less b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.less index 0eb3feb0..a59b9526 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.less +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.less @@ -1,86 +1,33 @@ :host { - .btn-size { - font-size: 14px; - } - - .bdr { - border-right: 1px solid #ccc; - } - - .bdl { - border-left: 1px solid #ccc; - } - - .source-info { - p { - margin-bottom: .5em; - } - } - - .freight-info-box { - width: 95%; - } - - .freigth-label { - display : inline-block; - width : 50px; - text-align: right; - } - - ::ng-deep { - .approval-status { - .ant-steps { - width : 70%; - margin: 0 auto; - } - } - - .ant-tabs-top>.ant-tabs-nav, - .ant-tabs-bottom>.ant-tabs-nav, - .ant-tabs-top>div>.ant-tabs-nav, - .ant-tabs-bottom>div>.ant-tabs-nav { - margin: 0; - } - - .ant-anchor-ink::before { - width: 0; - } - - .ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - .ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - .ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - .ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab { - margin-left: 40px - } - } - - .leftPadding { - padding-right: 100px; - } .tip-font { margin-left: 16px; font-weight: 500; - font-size : 12px; - } - - .card-title { + font-size: 12px; + } + + .card-title { margin-bottom: 24px; - font-weight : bold; - font-size : 16px; - } - - .align-center { - display : flex; - align-items : center; + font-weight: bold; + font-size: 16px; + } + + .align-center { + display: flex; + align-items: center; justify-content: center; - } - - #container { - width : 300px; + } + .align-center2 { + display: flex; + align-items: center; + } + #container { + width: 300px; height: 180px; - } - .ant-col-10 { - flex: none; - } + } + :host { + ::ng-deep { + nz-input-number{width: 100%;} + } + } } \ No newline at end of file diff --git a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts index 37e34e8c..3c24a693 100644 --- a/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts +++ b/src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-23 13:39:58 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 20:11:43 + * @LastEditTime : 2022-01-20 20:28:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -552,25 +552,25 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { nzWidth: 900, nzOnOk: item => { const poi = item.poi; - const locList = poi.pois; + const locList = poi.location.toString().split(','); switch (type) { case 'start': - this.startInfo[index].detailedAddress = poi.formattedAddress; + this.startInfo[index].detailedAddress = poi.district + poi.name; this.startInfo[index].longitude = locList[0]; this.startInfo[index].latitude = locList[1]; - this.startInfo[index].province = poi.addressComponent.province; - this.startInfo[index].city = poi.addressComponent.city; - this.startInfo[index].area = poi.addressComponent.district; - this.startInfo[index].address = poi.formattedAddress; + this.startInfo[index].province = poi.cityInfo.province; + this.startInfo[index].city = poi.cityInfo.city; + this.startInfo[index].area = poi.cityInfo.district; + this.startInfo[index].address = poi.name; break; case 'end': - this.endInfo[index].detailedAddress = poi.formattedAddress; + this.endInfo[index].detailedAddress = poi.district + poi.name; this.endInfo[index].longitude = locList[0]; this.endInfo[index].latitude = locList[1]; - this.endInfo[index].province = poi.addressComponent.province; - this.endInfo[index].city = poi.addressComponent.city; - this.endInfo[index].area = poi.addressComponent.district; - this.endInfo[index].address = poi.formattedAddress; + this.endInfo[index].province = poi.cityInfo.province; + this.endInfo[index].city = poi.cityInfo.city; + this.endInfo[index].area = poi.cityInfo.district; + this.endInfo[index].address = poi.name; break; default: break;