diff --git a/proxy.conf.js b/proxy.conf.js index 6a0a73cf..0b7a386b 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -18,6 +18,16 @@ module.exports = { // secure: false, // Ignore invalid SSL certificates // changeOrigin: true // } + // '//api': { + // target: { + // host: 'tms-api.yunduoxing.com', + // protocol: 'https:', + // port: 443 + // }, + // secure: false, + // changeOrigin: true, + // logLevel: 'debug' + // }, '//api': { target: { host: 'tms-api-test.eascs.com', diff --git a/src/app/routes/commom/less/trajectory.less b/src/app/routes/commom/less/trajectory.less new file mode 100644 index 00000000..17519018 --- /dev/null +++ b/src/app/routes/commom/less/trajectory.less @@ -0,0 +1,48 @@ +:host::ng-deep { + .text-truncate { + white-space: normal; + } + + .map_st { + max-height: 350px; + max-width : 360px; + position : absolute; + top : 20px; + right : 49px; + } + + .map_radio { + position : absolute; + top : 20px; + left : 20px; + background : #F4F4F5; + box-shadow : 0px 2px 8px 1px rgb(0 0 0 / 10%); + border-radius: 4px 4px 4px 4px; + + .ant-radio-button-wrapper { + background: #F4F4F5; + border : unset; + } + + .ant-radio-button-wrapper-checked { + color : #CF3834; + background: #ffffff; + } + + .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled)::before { + background-color: #d9d9d9; + } + } +} + +.detail_title { + font-size : 16px; + font-weight: 500; + color : #252A3D; + line-height: 24px; + + span { + color : #E60012; + font-weight: 700; + } +} \ No newline at end of file diff --git a/src/app/routes/datatable/components/compliance/customer/customer.component.html b/src/app/routes/datatable/components/compliance/customer/customer.component.html index 91c993cd..71f7089e 100644 --- a/src/app/routes/datatable/components/compliance/customer/customer.component.html +++ b/src/app/routes/datatable/components/compliance/customer/customer.component.html @@ -4,14 +4,15 @@ * @Author : Shiming * @Date : 2022-03-30 13:55:41 * @LastEditors : Shiming - * @LastEditTime : 2022-04-15 17:13:53 + * @LastEditTime : 2022-04-15 17:28:46 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\compliance\\customer\\customer.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - +
+
@@ -27,9 +28,10 @@
+
{ + console.log(value); + this.st.reload({ ...this.reqParams }); + } + }, + }, - no2: { + salesmanName: { type: 'string', - title: '业务员' + title: '', + ui: { + placeholder: '请输入业务员', + change: (value: any) => { + this.st.reload({ ...this.reqParams }); + } + } }, - no3: { + partnerName: { type: 'string', - title: '合伙人名称' + title: '', + ui: { + placeholder: '请输入客户名称', + change: (value: any) => { + console.log(value); + this.st.reload({ ...this.reqParams }); + } + } }, } }; @ViewChild('st') private readonly st!: STComponent; columns: STColumn[] = [ - { title: '公司名称', index: 'enterpriseName' ,}, - { title: '注册时间', index: 'registerTime' }, - { title: '客户类型', width: '100px', index: 'customerType' }, - { title: '业务员', index: 'salesmanName' }, - { title: '合伙人', index: 'partnerName' }, - { title: '订单数', index: 'billCounts' }, - { title: '订单不合格数', index: 'billQuaCounts' }, - { title: '订单不合格率', index: 'billQuaCountsPer' }, - { title: '货源单订单数', index: 'gsourceCounts' }, - { title: '合同单数', index: 'billConCounts' }, - { title: '货源单个', index: 'gsourceCounts' }, - { title: '运费直付单数', index: 'freightDirPayCounts' }, - { title: '运费代收单数', index: 'freightRepPayCounts' }, - { title: '手机直付', index: 'updatedAt' }, - { title: '汇款单数', index: 'updatedAt' }, - { title: '及时付款', index: 'timelyPayPer' }, + { title: '公司名称',width: '200px', index: 'enterpriseName' ,}, + { title: '注册时间', width: '200px', index: 'registerTime',}, + { title: '客户类型', width: '200px', index: 'customerType' }, + { title: '业务员',width: '200px', index: 'salesmanName' }, + { title: '合伙人',width: '200px', index: 'partnerName' }, + { title: '订单数',width: '200px', index: 'billCounts' }, + { title: '订单不合格数',width: '200px', index: 'billQuaCounts' }, + { title: '订单不合格率',width: '200px', index: 'billQuaCountsPer' }, + { title: '货源单订单数',width: '200px', index: 'gsourceCounts' }, + { title: '合同单数', width: '200px',index: 'billConCounts' }, + { title: '货源单个',width: '200px', index: 'gsourceCounts' }, + { title: '运费直付单数',width: '200px', index: 'freightDirPayCounts' }, + { title: '运费代收单数',width: '200px', index: 'freightRepPayCounts' }, + { title: '手机直付', width: '200px',index: 'updatedAt' }, + { title: '汇款单数',width: '200px', index: 'updatedAt' }, + { title: '及时付款',width: '200px', index: 'timelyPayPer' }, ]; 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 bd7bf8c1..3c1264f7 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 @@ -181,7 +181,7 @@ export class DatatableOrderReportingComponent implements OnInit { }, } }, - putTime: { + recentlyPutTime: { title: '上传时间', type: 'string', ui: { diff --git a/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts b/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts index 5b136434..f78e3b56 100644 --- a/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts +++ b/src/app/routes/datatable/reporting/components/view-track/view-track.component.ts @@ -4,20 +4,17 @@ import format from 'date-fns/format'; import { NzModalRef } from 'ng-zorro-antd/modal'; import { OrderManagementService } from 'src/app/routes/order-management/services/order-management.service'; - @Component({ selector: 'app-datatable-view-track', - templateUrl: './view-track.component.html', + templateUrl: './view-track.component.html' }) export class DatatableReportingvViewTrackComponent implements OnInit { - mapList: any[] = []; //地图点位数据组 - addressItems: any[] = []; //打点地址数据组 - trajectory = "car"; + mapList: any[] = []; //地图点位数据组 + addressItems: any[] = []; //打点地址数据组 + trajectory = 'car'; pois: any[] = []; id = ''; - constructor(public service: OrderManagementService, private modalRef: NzModalRef, public router: Router) { - - } + constructor(public service: OrderManagementService, private modalRef: NzModalRef, public router: Router) {} ngOnInit(): void { if (this.trajectory === 'car') { @@ -27,11 +24,7 @@ export class DatatableReportingvViewTrackComponent implements OnInit { } } - - - selectTab(e: any) { - - } + selectTab(e: any) {} close(): void { this.modalRef.destroy(); @@ -58,8 +51,6 @@ export class DatatableReportingvViewTrackComponent implements OnInit { } } }); - - } // 获取司机轨迹 @@ -75,12 +66,16 @@ export class DatatableReportingvViewTrackComponent implements OnInit { }); }); this.mapList = list; - this.addressItems = [...res.enclosureDataAppTrack]; - if (this.addressItems && this.addressItems.length > 0) { - this.addressItems.forEach(item => { - item.parkBte = item.parkBte ? this.getLocalTime(item.parkBte) : ''; - item.cityName = item.appAdress; + const addressItems = [...res.tracks]; + if (addressItems) { + addressItems.forEach(item => { + // item.parkBte = item.gtm; + item.parkBte = this.getLocalTime(item.gtm); + item.parkAdr = item.appAdress; }); + this.addressItems = [...addressItems]; + } else { + this.addressItems = []; } } }); @@ -88,5 +83,4 @@ export class DatatableReportingvViewTrackComponent implements OnInit { getLocalTime(time: any) { return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); } - } diff --git a/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts b/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts index e9668879..a2895ba9 100644 --- a/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts +++ b/src/app/routes/menu-manager/components/api-auth/auth-drawer/auth-drawer.component.ts @@ -30,7 +30,7 @@ export class AuthDrawerComponent implements OnInit { constructor(public service: MenuManagerService, private modal: NzModalService) {} ngOnInit(): void { - this.loadFunctions(); + // this.loadFunctions(); } beforeReq = (requestOptions: STRequestOptions) => { 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 85febdb2..edfb57a6 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 @@ -21,47 +21,44 @@

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

-
+
-
+
{{ i?.goodsResource?.enterpriseInfoName }} {{ 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 : ''}} +
+ + + + + + + + + + + + +
- +
  -   -   +   +    
@@ -69,9 +66,7 @@ -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
+
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
@@ -82,14 +77,9 @@
- +
@@ -98,25 +88,12 @@ 联系人
- + - +
@@ -124,8 +101,7 @@
- +
@@ -135,15 +111,9 @@
- +
@@ -152,25 +122,13 @@ 联系人
- + - +
@@ -200,97 +158,82 @@ - - - - {{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?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 - + + + + + - - - - - - + + {{ i?.carModel }}{{ i?.carLength ? "/" + i?.carLength : ''}} + + + {{i?.driverName}}{{ i?.driverPhone ? "/" + i?.driverPhone : ''}}{{ i?.carNo ? "/" + i?.carNo : ''}} + + + {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 + - + + + + + + + + - - - 运费信息到货后{{i?.goodsResource.paymentDays}}天内支付运费 - -
- {{ i?.freightPrice }}{{ i?.freightTypeLabel }} （{{ - i?.settlementBasisLabel }}，{{ - i?.ruleLabel - }}） -
- - - {{ item.price + item.surcharge | currency }} + + + 运费信息到货后{{i?.goodsResource?.paymentDays}}天内支付运费 - 到付 - {{item.price | currency}} - {{item.surcharge | currency}} - -
- 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | - currency }}， - 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%） -
-
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeIdNo }}
+
+ {{ i?.freightPrice }}{{ i?.freightTypeLabel }} （{{ + i?.settlementBasisLabel }}，{{ + i?.ruleLabel + }}） +
+ + + {{ item.price + item.surcharge | currency }} + + 到付 + {{item.price | currency}} + {{item.surcharge | currency}} + +
+ 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， + 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%） +
+
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeIdNo }} +
- 查看附件      - 补充协议 + 查看附件      + 补充协议 @@ -305,34 +248,27 @@ {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} + {{ + i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} {{ i?.supplementaryInformationVO?.area }} {{ i?.supplementaryInformationVO?.address }} - + - -
- -
请上传图片
-
- - - + 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 89713968..bf23f79e 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 @@ -19,7 +19,7 @@ import { OrderManagementService } from '../../services/order-management.service' @Component({ selector: 'app-supply-management-vehicle-detail', templateUrl: './vehicle-detail.component.html', - styleUrls: ['./vehicle-detail.component.less'] + styleUrls: ['./vehicle-detail.component.less', '../../../commom/less/trajectory.less'] }) export class OrderManagementVehicleDetailComponent implements OnInit { id = this.route.snapshot.params.id; @@ -46,7 +46,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { approvalLsit: any; isVisible = false; logColumns2: STColumn[] = [ - { title: '时间', index: 'parkBte' }, + { title: '时间', index: 'parkBte', width: 120, className: 'text-center' }, { title: '地点', index: 'parkAdr' } ]; logColumns3: STColumn[] = [ @@ -56,7 +56,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { operateLogColums: STColumn[] = [ { title: '内容', index: 'operationContent' }, { title: '操作人', render: 'operator' }, - { title: '操作时间', index: 'operatorTimestamp' }, + { title: '操作时间', index: 'operatorTimestamp' } ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, @@ -84,7 +84,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.getTrajectory(); } get logParams() { - return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } + return { operateObject: this.i?.billCode, operateTypeList: ['3', '8'] }; } initData() { this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => { @@ -108,22 +108,24 @@ export class OrderManagementVehicleDetailComponent implements OnInit { time: '计划卸货时间：' + res.unloadPlanTime } ]; - this.service.request(this.service.$api_get_log_list,{operateObject: this.i?.billCode, operateTypeList: ['3','8']}).subscribe(res => { - if (res) { - console.log('操作日志'); - console.log(res); - let a :any= [] - res.records.forEach((item: any) => { - a.push({ - value: `操作人： ${item.operator}
操作内容： ${ item.operationContent}`, - time: item.operatorTimestamp, - color: 'green' - }) - }) - console.log(a); - this.operationList = a; - } - }); + this.service + .request(this.service.$api_get_log_list, { operateObject: this.i?.billCode, operateTypeList: ['3', '8'] }) + .subscribe(res => { + if (res) { + console.log('操作日志'); + console.log(res); + let a: any = []; + res.records.forEach((item: any) => { + a.push({ + value: `操作人： ${item.operator}
操作内容： ${item.operationContent}`, + time: item.operatorTimestamp, + color: 'green' + }); + }); + console.log(a); + this.operationList = a; + } + }); this.billExpenses = this.i?.billExpenseDetails?.filter( (data: any) => data.expenseCode === 'PRE' || data.expenseCode === 'RECE' || data.expenseCode === 'BACK' ); @@ -140,10 +142,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit { if (res) { console.log('异常预警'); console.log(res); - this.warringList = res + this.warringList = res; } }); - } // 取消订单 cancellation() { @@ -185,7 +186,7 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.isVisible = false; } - goDistance(elf: NzCardComponent) { + goDistance(elf: any) { if (elf) { elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); // elf['elementRef'].nativeElement.className = 'target-fix' @@ -205,11 +206,14 @@ export class OrderManagementVehicleDetailComponent implements OnInit { }); }); this.mapList = list; - this.addressItems = res.parkArray; - if (this.addressItems && this.addressItems.length > 0) { - this.addressItems.forEach(item => { + const addressItems: any[] = res.parkArray; + if (addressItems?.length > 0) { + addressItems.forEach(item => { item.parkBte = this.getLocalTime(item.parkBte); }); + this.addressItems = [...addressItems]; + } else { + this.addressItems = []; } } }); @@ -228,13 +232,17 @@ export class OrderManagementVehicleDetailComponent implements OnInit { time: item.gtm }); }); - this.mapList = list; - this.addressItems = [...res.enclosureDataAppTrack]; - if (this.addressItems && this.addressItems.length > 0) { - this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.gtm); - item.cityName = item.appAdress; + this.mapList = list || []; + const addressItems = [...res.tracks]; + if (addressItems) { + addressItems.forEach(item => { + // item.parkBte = item.gtm; + item.parkBte = this.getLocalTime(item.gtm); + item.parkAdr = item.appAdress; }); + this.addressItems = [...addressItems]; + } else { + this.addressItems = []; } } }); diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts index 27494ac4..b24ecb46 100644 --- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts @@ -859,7 +859,7 @@ export class OrderManagementVehicleComponent extends BasicTableComponent impleme const modalRef = this.modal.create({ nzTitle: '查看轨迹', nzContent: OneCarOrderViewtrackComponent, - nzWidth: '800px', + nzWidth: '900px', nzComponentParams: { i: item }, diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html index 1d27458b..ad50faeb 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.html @@ -8,27 +8,21 @@ * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\view-track\\view-track.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> -
- -
-
- - -
-
- -
-
- - - - - - - +
+
+ + + + + + + +
+
-
+
\ No newline at end of file diff --git a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts index 976896dc..0b5c1dff 100644 --- a/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts +++ b/src/app/routes/order-management/modal/vehicle/view-track/view-track.component.ts @@ -1,5 +1,5 @@ /* - * @Description : + * @Description : * @Version : 1.0 * @Author : Shiming * @Date : 2022-02-22 13:53:29 @@ -25,21 +25,20 @@ import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalRef, NzModalService } from 'ng-zorro-antd/modal'; import { OrderManagementService } from '../../../services/order-management.service'; - @Component({ selector: 'app-order-management-view-track', - styleUrls: ['./view-track.component.less'], + styleUrls: ['./view-track.component.less', '../../../../commom/less/trajectory.less'], templateUrl: './view-track.component.html' }) export class OneCarOrderViewtrackComponent implements OnInit { - i: any; // 单行数据 - MapList:any[] = []; //地图点位数据组 + i: any; // 单行数据 + MapList: any[] = []; //地图点位数据组 trajectory = 'car'; - mapList:any[] = []; //地图点位数据组 + mapList: any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 logColumns2: STColumn[] = [ { title: '时间', index: 'parkBte' }, - { title: '地点', index: 'parkAdr' }, + { title: '地点', index: 'parkAdr' } ]; constructor( private modalRef: NzModalRef, @@ -51,67 +50,70 @@ export class OneCarOrderViewtrackComponent implements OnInit { ngOnInit(): void { console.log(this.i); this.getTrajectory(); - } close(value: boolean): void { - this.modalRef.close(false); + this.modalRef.close(false); } - // 获取车辆轨迹 - getTrajectory(){ - this.service.request(this.service.$api_get_getTrajectory, { id: this.i?.id }).subscribe(res => { - if (res) { - const points = res.trackArray; - let list :any[] = []; - points?.forEach((item: any) => { - list.push({ - name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], - time: item.gtm - }); + // 获取车辆轨迹 + getTrajectory() { + this.service.request(this.service.$api_get_getTrajectory, { id: this.i?.id }).subscribe(res => { + if (res) { + const points = res.trackArray; + let list: any[] = []; + points?.forEach((item: any) => { + list.push({ + name: item.hgt, + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); - this.mapList = list; - this.addressItems = res.parkAdr; - if(this.addressItems && this.addressItems.length > 0){ - this.addressItems.forEach(item => { - item.parkBte = this.getLocalTime(item.parkBte); - }); - } - } - }); - } - - // 获取司机轨迹 - getDriverTrajectory(){ - this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.i?.id }).subscribe(res => { - if (res) { - const points = res.tracks; - let list :any[] = []; - points?.forEach((item: any) => { - list.push({ - name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], - time: item.gtm - }); + }); + this.mapList = list; + this.addressItems = res.parkAdr; + if (this.addressItems && this.addressItems.length > 0) { + this.addressItems.forEach(item => { + item.parkBte = this.getLocalTime(item.parkBte); }); - this.mapList = list; - this.addressItems = [...res.enclosureDataAppTrack]; - if(this.addressItems && this.addressItems.length > 0){ - this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.gtm); - item.cityName = item.appAdress; - }); - } } - }); - } - trajectoryChange(event:any){ - if(event ==='car'){ - this.getTrajectory() - }else if(event ==='driver'){ - this.getDriverTrajectory(); } - } - getLocalTime(time: any) { - return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); + }); + } + + // 获取司机轨迹 + getDriverTrajectory() { + this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.i?.id }).subscribe(res => { + if (res) { + const points = res.tracks; + let list: any[] = []; + points?.forEach((item: any) => { + list.push({ + name: item.hgt, + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm + }); + }); + this.mapList = list; + const addressItems = [...res.tracks]; + if (addressItems) { + addressItems.forEach(item => { + // item.parkBte = item.gtm; + item.parkBte = this.getLocalTime(item.gtm); + item.parkAdr = item.appAdress; + }); + this.addressItems = [...addressItems]; + } else { + this.addressItems = []; + } + } + }); + } + trajectoryChange(event: any) { + if (event === 'car') { + this.getTrajectory(); + } else if (event === 'driver') { + this.getDriverTrajectory(); } + } + getLocalTime(time: any) { + return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); + } } diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index b075743d..bd5a1802 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -13,17 +13,19 @@ -
+

运单号: {{ i?.wayBillCode }}

- - + +
-
+
{{ i?.enterpriseInfoName }} {{ i?.shippername }} @@ -33,20 +35,20 @@ {{ i?.externalBillCode }} {{ i?.resourceCode }} {{ i?.paymentDays }} -
- - - - - - - - - - - - -
+
+ + + + + + + + + + + + +
@@ -54,12 +56,8 @@
  - +
@@ -70,13 +68,14 @@ {{i?.goodsInfos?.[0]?.goodsName}} - - + + {{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件 - {{i?.goodsInfos?.[0]?.carModelLabel}}{{ i?.goodsInfos?.[0]?.carLength ? '/' + i?.goodsInfos?.[0]?.carLength + '米': ''}} + {{i?.goodsInfos?.[0]?.carModelLabel}}{{ i?.goodsInfos?.[0]?.carLength ? '/' + i?.goodsInfos?.[0]?.carLength + '米': + ''}} {{i?.driver?.name}}/{{i?.driver?.phone}} @@ -99,44 +98,44 @@ {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方 - -
-

装货卸货信息 - ( - - - ) - -

-
-
-
-
-
-
装
-
-

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

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+ +
+

装货卸货信息 + ( + + + ) + +

+
+
+
+
+
+
装
+
+

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

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
-
-
-
-
-
-
卸
-
-

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

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
+
+
+
卸
+
+

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

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
-
- - - 运费信息到货后{{i?.goodsResource.paymentDays}}天内支付运费 - -
- {{ i?.freightPrice }}{{ i?.freightTypeLabel }} （{{ - i?.settlementBasisLabel }}，{{ - i?.ruleLabel - }}） -
- - - {{ item.price + item.surcharge | currency }} + + + 运费信息到货后{{i?.goodsResource.paymentDays}}天内支付运费 - 到付 - {{item.price | currency}} - {{item.surcharge | currency}} - -
- 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | - currency }}， - 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%） -
-
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}
+
+ {{ i?.freightPrice }}{{ i?.freightTypeLabel }} （{{ + i?.settlementBasisLabel }}，{{ + i?.ruleLabel + }}） +
+ + + {{ item.price + item.surcharge | currency }} + + 到付 + {{item.price | currency}} + {{item.surcharge | currency}} + +
+ 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， + 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%） +
+
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}
 - 查看附件      - 补充协议 + 查看附件      + 补充协议 @@ -227,7 +226,7 @@ {{i?.receiptAddress}} - + @@ -238,35 +237,32 @@ + +

| 轨迹信息

- -
-
- - -
-
- -
-
- - - +
+ + + + + - +
- +
暂无附件信息
 - + \ No newline at end of file diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts index 37877333..9adba23c 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.ts @@ -20,27 +20,26 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic @Component({ selector: 'app-supply-management-bulk-detail', templateUrl: './bulk-detail.component.html', - styleUrls: ['./bulk-detail.component.less'] + styleUrls: ['./bulk-detail.component.less', '../../../commom/less/trajectory.less'] }) export class WaybillManagementBulkeDetailComponent implements OnInit { - id = this.route.snapshot.params.id; i: any; totalObj: any; attObj: any; isVisible = false; - MapList: any[]=[]; + MapList: any[] = []; trajectory = 'car'; - mapList:any[] = []; //地图点位数据组 - addressItems:any[] = []; //打点地址数据组 + mapList: any[] = []; //地图点位数据组 + addressItems: any[] = []; //打点地址数据组 billExpenses: any[] = []; //运费信息表格信息 imges: any; modalcontent: any; - modalTitle:string = ''; + modalTitle: string = ''; unLoadingPlaceVOList: any = []; logColumns2: STColumn[] = [ { title: '时间', index: 'parkBte' }, - { title: '地点', index: 'parkAdr' }, + { title: '地点', index: 'parkAdr' } ]; logColumns: STColumn[] = [ { title: '款项', index: 'costCodeLabel' }, @@ -65,33 +64,30 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { constructor( private route: ActivatedRoute, private msgSrv: NzMessageService, - private modal: NzModalService, + private modal: NzModalService, private service: WaybillManagementServe, private modalService: NzModalService - ) { - - } + ) {} ngOnInit(): void { - this.initData() - this.getTrajectory() + this.initData(); + this.getTrajectory(); } initData() { const params = { id: this.id - } - this.service.request(this.service.$api_get_getBulkDetail, params).subscribe((res) => { - console.log(res) - this.unLoadingPlaceVOList.push(...res.loadingPlace) - this.unLoadingPlaceVOList.push(...res.dischargePlace) - console.log(this.unLoadingPlaceVOList) + }; + this.service.request(this.service.$api_get_getBulkDetail, params).subscribe(res => { + console.log(res); + this.unLoadingPlaceVOList.push(...res.loadingPlace); + this.unLoadingPlaceVOList.push(...res.dischargePlace); + console.log(this.unLoadingPlaceVOList); this.i = res; this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.costCode === 'TRA'); - this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data:any)=>data.displayStatus !=="HIDE"); - }) + this.i.scheduleVOList = this.i?.scheduleVOList?.filter((data: any) => data.displayStatus !== 'HIDE'); + }); } - hand() { this.modalService.create({ nzTitle: '', @@ -104,66 +100,64 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { window.history.go(-1); } agreement(value: any) { - if(value ==='1'){ + if (value === '1') { this.modalTitle = '附件信息'; this.modalcontent = this.i?.contractContent?.contractContent; - - }else if(value === '2'){ + } else if (value === '2') { this.modalTitle = '补充协议'; this.modalcontent = this.i?.supplementContent?.contractContent; } this.isVisible = true; } handleCancel() { - this.isVisible = false -} -handleOK() { - this.isVisible = false -} -goDistance(elf: NzCardComponent) { - if (elf) { - elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + this.isVisible = false; + } + handleOK() { + this.isVisible = false; + } + goDistance(elf: any) { + if (elf) { + elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); + } + } + // *确认发车 + sureDepart(item: any) { + const modalRef = this.modal.create({ + nzTitle: '确认发车', + nzWidth: '50%', + nzContent: VehicleSureDepartComponent, + nzComponentParams: { + i: item, + Status: 2 + }, + nzFooter: null + }); + modalRef.afterClose.subscribe((result: any) => { + this.initData(); + }); + } + // 确认到车 + sureArrive(item: any) { + const modalRef = this.modal.create({ + nzTitle: '确认到车', + nzWidth: '50%', + nzContent: VehicleSureArriveComponent, + nzComponentParams: { + i: item, + Status: 2 + }, + nzFooter: null + }); + modalRef.afterClose.subscribe((result: any) => { + this.initData(); + }); } -} - // *确认发车 - sureDepart(item: any) { - const modalRef = this.modal.create({ - nzTitle: '确认发车', - nzWidth: '50%', - nzContent: VehicleSureDepartComponent, - nzComponentParams: { - i: item, - Status: 2 - }, - nzFooter: null - }); - modalRef.afterClose.subscribe((result: any) => { - this.initData() - -}); -} -// 确认到车 -sureArrive(item: any) { - const modalRef = this.modal.create({ - nzTitle: '确认到车', - nzWidth: '50%', - nzContent: VehicleSureArriveComponent, - nzComponentParams: { - i: item, - Status: 2 - }, - nzFooter: null - }); - modalRef.afterClose.subscribe((result: any) => { - this.initData() -}); -} // 获取车辆轨迹 - getTrajectory(){ + getTrajectory() { this.service.request(this.service.$api_get_getTrajectory, { id: this.id }).subscribe(res => { if (res) { const points = res.trackArray; - let list :any[] = []; + let list: any[] = []; points?.forEach((item: any) => { list.push({ name: item.hgt, @@ -173,7 +167,7 @@ sureArrive(item: any) { }); this.mapList = list; this.addressItems = res.parkArray; - if(this.addressItems && this.addressItems.length > 0){ + if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { item.parkBte = this.getLocalTime(item.parkBte); }); @@ -182,12 +176,12 @@ sureArrive(item: any) { }); } - // 获取司机轨迹 - getDriverTrajectory(){ + // 获取司机轨迹 + getDriverTrajectory() { this.service.request(this.service.$api_get_getAppDriverPosition, { id: this.id }).subscribe(res => { if (res) { const points = res.tracks; - let list :any[] = []; + let list: any[] = []; points?.forEach((item: any) => { list.push({ name: item.hgt, @@ -196,23 +190,27 @@ sureArrive(item: any) { }); }); this.mapList = list; - this.addressItems = [...res.enclosureDataAppTrack]; - if(this.addressItems && this.addressItems.length > 0){ - this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.gtm); - item.cityName = item.appAdress; + const addressItems = [...res.tracks]; + if (addressItems) { + addressItems.forEach(item => { + // item.parkBte = item.gtm; + item.parkBte = this.getLocalTime(item.gtm); + item.parkAdr = item.appAdress; }); + this.addressItems = [...addressItems]; + } else { + this.addressItems = []; } } }); - } - trajectoryChange(event:any){ - if(event ==='car'){ - this.getTrajectory() - }else if(event ==='driver'){ + } + trajectoryChange(event: any) { + if (event === 'car') { + this.getTrajectory(); + } else if (event === 'driver') { this.getDriverTrajectory(); } - } + } getLocalTime(time: any) { return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); } diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index 0ff1b2cc..a59aa3f7 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -6,7 +6,7 @@ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html --> - +

运单号: {{ i?.wayBillCode }}

-
-
- - +
+
+ +
-
+
{{ i?.enterpriseInfoName }} {{ i?.shippername }} @@ -32,33 +34,29 @@ {{i?.dispatchName}}{{ i?.dispatchPhone ? '/' + i?.dispatchPhone : '' }} {{ i?.resourceCode }} {{ i?.paymentDays }} -
- - - - - - - - - - - - -
+
+ + + + + + + + + + + + +
  -   -   +   +    
@@ -69,19 +67,21 @@ {{i?.goodsInfos?.[0]?.goodsName}} - - + + {{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件 - {{i?.goodsInfos?.[0]?.carModelLabel}}{{ i?.goodsInfos?.[0]?.carLength ? '/' + i?.goodsInfos?.[0]?.carLength + '米': ''}} + {{i?.goodsInfos?.[0]?.carModelLabel}}{{ i?.goodsInfos?.[0]?.carLength ? '/' + i?.goodsInfos?.[0]?.carLength + '米': + ''}} {{i?.driverVo?.name}}{{ i?.driverVo?.phone ? '/' + i?.driverVo?.phone : ''}} - {{ i?.carVO?.carModelLabel ? i?.carVO?.carModelLabel +',': ''}}{{ i?.carVO?.carLengthLabel ? i?.carVO?.carLengthLabel +'米,': ''}}{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}} + {{ i?.carVO?.carModelLabel ? i?.carVO?.carModelLabel +',': ''}}{{ i?.carVO?.carLengthLabel ? + i?.carVO?.carLengthLabel +'米,': ''}}{{i?.carVO?.carLoad ? i?.carVO?.carLoad +'吨': ''}} {{i?.loadingTime}} @@ -89,44 +89,44 @@ {{i?.unloadingTime}} - -
-

装货卸货信息 - ( - - - ) - -

-
-
-
-
-
-
装
-
-

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

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+ +
+

装货卸货信息 + ( + + + ) + +

+
+
+
+
+
+
装
+
+

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

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
-
-
-
-
-
-
卸
-
-

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

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
+
+
+
+
卸
+
+

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

+

联系人：{{item.appUserName}}/{{item.contractTelephone}}

+
-
@@ -154,17 +154,19 @@
- 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | currency }}， + 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | + currency }}， 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ (i?.totalRate * 100).toFixed(2)}}% ）
-
车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone }}/{{ i?.payee?.idNo }}
+
车队长：{{ i?.payee?.name }}/{{ i?.payee?.phone + }}/{{ i?.payee?.idNo }}
 - 查看附件      - 补充协议 + 查看附件      + 补充协议 @@ -186,7 +188,8 @@ {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - {{ i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} + {{ + i?.supplementaryInformationVO?.receiptUserName }} / {{ i?.supplementaryInformationVO?.phon }} {{ i?.supplementaryInformationVO?.area }} @@ -205,34 +208,30 @@ +

| 轨迹信息

- -
-
- - -
-
- -
-
- - - +
+ + + + + - +
- +
暂无附件信息
 - + \ No newline at end of file diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts index 1b96e1f4..8cf59d1b 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.ts @@ -21,12 +21,12 @@ import { WaybillManagementServe } from '../../services/waybill-management.servic @Component({ selector: 'app-supply-management-vehicle-detail', templateUrl: './vehicle-detail.component.html', - styleUrls: ['./vehicle-detail.component.less'] + styleUrls: ['./vehicle-detail.component.less', '../../../commom/less/trajectory.less'] }) export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestroy { id = this.route.snapshot.params.id; MapList: any[] = []; - trajectory = 'car'; + trajectory = 'car'; mapList: any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 i: any; @@ -36,11 +36,11 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro imges: any; unLoadingPlaceVOList: any = []; logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' } + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' } ]; modalcontent: any; - modalTitle:string = ''; + modalTitle: string = ''; billExpenses: any[] = []; //运费信息表格信息 logColumns: STColumn[] = [ { title: '款项', index: 'costCodeLabel' }, @@ -96,11 +96,10 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro window.history.go(-1); } agreement(value: any) { - if(value ==='1'){ + if (value === '1') { this.modalTitle = '附件信息'; this.modalcontent = this.i?.contractContent?.contractContent; - - }else if(value === '2'){ + } else if (value === '2') { this.modalTitle = '补充协议'; this.modalcontent = this.i?.supplementContent?.contractContent; } @@ -112,7 +111,7 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro handleOK() { this.isVisible = false; } - goDistance(elf: NzCardComponent) { + goDistance(elf: any) { if (elf) { elf['elementRef'].nativeElement.scrollIntoView({ behavior: 'smooth', block: 'start', inline: 'start' }); } @@ -189,12 +188,16 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro }); }); this.mapList = list; - this.addressItems = [...res.enclosureDataAppTrack]; - if (this.addressItems && this.addressItems.length > 0) { - this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.gtm); - item.cityName = item.appAdress; + const addressItems = [...res.tracks]; + if (addressItems) { + addressItems.forEach(item => { + // item.parkBte = item.gtm; + item.parkBte = this.getLocalTime(item.gtm); + item.parkAdr = item.appAdress; }); + this.addressItems = [...addressItems]; + } else { + this.addressItems = []; } } });