diff --git a/src/app/layout/pro/components/widget/widget.component.html b/src/app/layout/pro/components/widget/widget.component.html index f16d7571..cd3cb9c9 100644 --- a/src/app/layout/pro/components/widget/widget.component.html +++ b/src/app/layout/pro/components/widget/widget.component.html @@ -1,3 +1,4 @@ +客服电话：0755-88393483 diff --git a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts index 517ec984..0a13f444 100644 --- a/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts +++ b/src/app/routes/contract-management/components/contract-frame/contract-frame.component.ts @@ -33,37 +33,37 @@ export class ContractManagementFrameComponent implements OnInit { private router: Router, public shipperservice: ShipperBaseService, private datePipe: DatePipe, - ) {} + ) { } ngOnInit(): void { this.initST(); this.initSF(); } - /** - * 查询参数 - */ - get reqParams() { - const params = { - ...this.sf?.value, - } - delete params.signTime; - delete params._$expand; - if(this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')) { - params.signTime = { - start: this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss'), - end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss'), - } - } - if(this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss')) { - params.effectiveEndTime = { - start: this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[0], 'yyyy-MM-dd HH:mm:ss'), - end: this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss'), - } - } - return { - ...params - }; + /** +* 查询参数 +*/ + get reqParams() { + const params = { + ...this.sf?.value, } + delete params.signTime; + delete params._$expand; + if (this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss')) { + params.signTime = { + start: this.datePipe.transform(this.sf?.value?.signTime?.[0], 'yyyy-MM-dd HH:mm:ss'), + end: this.datePipe.transform(this.sf?.value?.signTime?.[1], 'yyyy-MM-dd HH:mm:ss'), + } + } + if (this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[0], 'yyyy-MM-dd HH:mm:ss') && this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss')) { + params.effectiveEndTime = { + start: this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[0], 'yyyy-MM-dd HH:mm:ss'), + end: this.datePipe.transform(this.sf?.value?.effectiveEndTime?.[1], 'yyyy-MM-dd HH:mm:ss'), + } + } + return { + ...params + }; + } /** * 初始化数据列表 */ @@ -91,7 +91,7 @@ export class ContractManagementFrameComponent implements OnInit { title: '合同名称', width: '100px', className: 'text-center', - index: 'templateName' + index: 'contractName' }, { title: '网络货运人', index: 'enterpriseInfoName', width: '120px', className: 'text-center' }, { title: '合同对象', index: 'contractObjectName', width: '120px', className: 'text-center' }, @@ -157,7 +157,7 @@ export class ContractManagementFrameComponent implements OnInit { widget: 'dict-select', containsAllLable: true, params: { dictKey: 'contract:type' }, - containAllLable:true, + containAllLable: true, } as SFSelectWidgetSchema, }, enterpriseInfoId: { @@ -210,7 +210,7 @@ export class ContractManagementFrameComponent implements OnInit { widget: 'dict-select', containsAllLable: true, params: { dictKey: 'esign:flow:status' }, - containAllLable:true, + containAllLable: true, visibleIf: { _$expand: (value: boolean) => value, }, @@ -238,9 +238,9 @@ export class ContractManagementFrameComponent implements OnInit { } } - approval(): void {} + approval(): void { } - add(): void {} + add(): void { } routeTo(item: any) { this.router.navigate(['/ticket/invoice-requested-detail/1']); diff --git a/src/app/routes/contract-management/components/contract-list/contract-list.component.html b/src/app/routes/contract-management/components/contract-list/contract-list.component.html index 2c054c6a..0876e5cf 100644 --- a/src/app/routes/contract-management/components/contract-list/contract-list.component.html +++ b/src/app/routes/contract-management/components/contract-list/contract-list.component.html @@ -30,7 +30,7 @@
+ (click)="st?.load(1)" acl [acl-ability]="['CONTRACT-INDEX-searchDetail']">查询
- + - {{ item?.contractCode }} + {{ item?.contractCode }} + - - + + diff --git a/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.html b/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.html index ff37b3f7..7246f2c3 100644 --- a/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.html +++ b/src/app/routes/contract-management/components/contract-template-frame/contract-template-frame.component.html @@ -75,7 +75,8 @@ [loading]="false" > - {{ item.templateName }} + {{ item.templateName }} + 货主 diff --git a/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.html b/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.html index 1ecef42c..235be94d 100644 --- a/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.html +++ b/src/app/routes/contract-management/components/contract-template-partner/contract-template-partner.component.html @@ -75,7 +75,8 @@ [loading]="false" > - {{ item.templateName }} + {{ item.templateName }} + diff --git a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts index dc30343e..b6cd6e92 100644 --- a/src/app/routes/datatable/components/datascreen/curve/curve.component.ts +++ b/src/app/routes/datatable/components/datascreen/curve/curve.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-07 17:57:23 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 19:28:24 + * @LastEditTime : 2022-04-13 10:22:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\curve\\curve.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -75,7 +75,7 @@ export class DatatableCustomindexCurveMinComponent implements OnInit,OnChanges { this.chart = new Chart({ container: el, autoFit: true, - height: 200, + height: 320, }); let value: any = [] this.service.request(this.service.$api_getTradingTrend).subscribe((res: any) => { diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.html b/src/app/routes/datatable/components/datascreen/datascreen.component.html index ee417920..e614479a 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.html +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 19:51:32 + * @LastEditTime : 2022-04-13 15:20:32 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -23,7 +23,7 @@
-
+
@@ -47,11 +47,11 @@ - {{ index }} + {{ index + 1 }} {{ item.weight ? item.weight + '吨' : '' }} @@ -72,7 +72,7 @@
-
+
@@ -86,14 +86,14 @@ - + - +
-
+
@@ -157,7 +157,7 @@ #st multiSort bordered - [scroll]="{y: '300px'}" + [scroll]="{y: '290px'}" [columns]="orderColumns" [data]="service.$api_getRealTimeWaybillRiskControl" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqOrderParams }" diff --git a/src/app/routes/datatable/components/datascreen/datascreen.component.ts b/src/app/routes/datatable/components/datascreen/datascreen.component.ts index 08babea1..128e3f9e 100644 --- a/src/app/routes/datatable/components/datascreen/datascreen.component.ts +++ b/src/app/routes/datatable/components/datascreen/datascreen.component.ts @@ -5,7 +5,7 @@ import { map } from 'rxjs/operators'; * @Author : Shiming * @Date : 2022-04-06 10:57:56 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 19:48:19 + * @LastEditTime : 2022-04-13 10:25:50 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\datascreen.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -127,7 +127,7 @@ export class DatatableDatascreenComponent implements OnInit { */ initST() { this.columns = [ - { title: '序号', render: 'index', className: 'text-center', width: '70px' }, + { title: '序号', render: 'index', className: 'text-center', width: '70px', }, { title: '发货地', index: 'loadAddress', className: 'text-center', width: '90px' }, { title: '卸货地', index: 'dischargeAddress', className: 'text-center', width: '90px' }, { title: '货物', index: 'goodsName', className: 'text-center', width: '90px' }, @@ -138,7 +138,7 @@ export class DatatableDatascreenComponent implements OnInit { this.orderColumns = [ { title: '运单号', index: 'wayCode', className: 'text-center', width: '150px' }, { title: '司机/车辆', index: 'carNo', className: 'text-center', width: '120px' }, - { title: '货主', index: 'shipperName', className: 'text-center', width: '70px' }, + { title: '货主', index: 'shipperName', className: 'text-center', width: '200px' }, { title: '时间', index: 'createTime', className: 'text-center', width: '200px' }, { title: '异常预警', index: 'warningTypeLabel', className: 'text-center', width: '120px' } ]; diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.html b/src/app/routes/datatable/components/datascreen/map/map.component.html index 99a40aa8..1ff87c79 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.html +++ b/src/app/routes/datatable/components/datascreen/map/map.component.html @@ -4,8 +4,9 @@ * @Author : Shiming * @Date : 2022-04-06 17:57:07 * @LastEditors : Shiming - * @LastEditTime : 2022-04-07 19:44:32 + * @LastEditTime : 2022-04-13 15:20:33 * @FilePath : \\tms-obc-web\\src\\app\\routes\\datatable\\components\\datascreen\\map\\map.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> - \ No newline at end of file + + \ No newline at end of file diff --git a/src/app/routes/datatable/components/datascreen/map/map.component.ts b/src/app/routes/datatable/components/datascreen/map/map.component.ts index 66c3a677..23d25d80 100644 --- a/src/app/routes/datatable/components/datascreen/map/map.component.ts +++ b/src/app/routes/datatable/components/datascreen/map/map.component.ts @@ -1,4 +1,4 @@ -import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; +import { Component, ElementRef, Input, NgZone, OnChanges, OnInit, SimpleChanges, ViewChild, AfterViewInit } from '@angular/core'; import { Chart } from '@antv/g2'; import DataSet from '@antv/data-set'; import { DataService } from 'src/app/routes/datatable/services/data.service'; @@ -7,9 +7,11 @@ import { DataService } from 'src/app/routes/datatable/services/data.service'; templateUrl: './map.component.html', styleUrls: ['./map.component.less'] }) -export class DatatableCustomindexMapComponent implements OnInit, OnChanges { +export class DatatableCustomindexMapComponent implements OnInit, OnChanges, AfterViewInit { el: any; @Input() chartData: any; + @ViewChild('auditModal', { static: false }) auditModal!: any; + @ViewChild('map',{static: false}) map!: any; chart: any; mapData: any; ds!: DataSet ; @@ -18,6 +20,10 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { userDv: any; userData: any = []; constructor(private service: DataService, private ngZone: NgZone) {} + ngAfterViewInit(): void { + this.map.el.nativeElement.style.height = this.map.el.nativeElement.clientWidth + 'px' + this.chart.render(); + } ngOnChanges(changes: SimpleChanges): void { if (this.chartData) { @@ -26,7 +32,7 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { // }, 1000) } } - + ngOnInit(): void {} reRender() { console.log('5454545'); @@ -49,7 +55,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { this.chart = new Chart({ container: el, autoFit: true, - height: 680, padding: [0, 0] }); this.chart.tooltip({ @@ -85,18 +90,6 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { stroke: '#ccc', lineWidth: 1 }); - - // 可视化用户数据 - // this.userData = [ - // { name: '山东', value: 21 }, - // { name: '山东', value: 22}, - // { name: '广东', value: 20, }, - // { name: '广东', value: 20 }, - // { name: '四川', value: 120 }, - // { name: '湖南', value: 200 }, - // { name: '河北', value: 30 }, - - // ]; let value: any = [] this.service.request(this.service.$api_getTransactionDistribution).subscribe((res: any) => { if(res) { @@ -108,6 +101,10 @@ export class DatatableCustomindexMapComponent implements OnInit, OnChanges { }); console.log(value); this.userData = value + +if (!(this.userData instanceof Array) || this.userData.length === 0) { + return; + } this.userDv = this.ds.createView().source(this.userData).transform({ geoDataView: this.worldMap, field: 'name', diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html index 32f56a3b..eee013ee 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.html @@ -34,13 +34,13 @@ {{item?.verifyStatusLabel}} - {{item?.verifyStatusLabel}} + {{item?.verifyStatusLabel}} - {{item?.orderCode}} + {{item?.orderCode}} - {{item?.wayBillCode}} + {{item?.wayBillCode}}
{{item?.tolalAmount | currency }}
diff --git a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts index 1b75e714..fa6f9e4d 100644 --- a/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts +++ b/src/app/routes/datatable/reporting/components/fund-reporting/fund-reporting.component.ts @@ -163,9 +163,9 @@ export class DatatableFundReportingComponent implements OnInit { title: '本地校验', type: 'string', enum: [ - { label: '校验中', value: 0 }, - { label: '通过', value: 1 }, - { label: '不通过', value: 2 } + { label: '检测中', value: '0' }, + { label: '通过', value: '1' }, + { label: '不通过', value: '2' } ], ui: { placeholder: '请选择', @@ -465,6 +465,23 @@ export class DatatableFundReportingComponent implements OnInit { } } + routeToOrder(item: any) { + if (item.orderType === '1') { + window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`); + } else { + window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`); + } + } + + routeTowaybill(item: any) { + if (item.orderType === '1') { + window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.wayBillId}`); + + } else { + window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.wayBillId}`); + + } + } } diff --git a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html index df751a97..be7285cc 100644 --- a/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html +++ b/src/app/routes/datatable/reporting/components/order-reporting/order-reporting.component.html @@ -49,10 +49,10 @@ - {{item?.billCode}} + {{item?.billCode}} - {{item?.wayBillCode}} + {{item?.wayBillCode}} 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 6a15cc8c..d8bafb1f 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 @@ -23,13 +23,13 @@ export class DatatableOrderReportingComponent implements OnInit { @ViewChild('sf', { static: false }) sf!: SFComponent; tabType!: string; tabs: any[] = [ - { name: '待上传', value: '1' }, - { name: '上传中', value: '2' }, - { name: '已上传', value: '3' }, - { name: '异常', value: '4' }, + { name: '待上传', value: '0' }, + { name: '上传中', value: '3' }, + { name: '已上传', value: '1' }, + { name: '异常', value: '2' }, { name: '全部', value: '' } ]; - selectedIndex = '1'; + selectedIndex = '0'; isLoading: boolean = false; selectedRows: any[] = []; constructor( @@ -53,7 +53,7 @@ export class DatatableOrderReportingComponent implements OnInit { */ get reqParams() { const params = Object.assign({}, this.sf?.value || {}, { - putStatus: this.selectedIndex, + billPutStatus: this.selectedIndex, }); delete params._$expand; return { ...params }; @@ -169,7 +169,7 @@ export class DatatableOrderReportingComponent implements OnInit { title: '本地校验', type: 'string', enum: [ - { label: '校验中', value: 0 }, + { label: '检测中', value: 0 }, { label: '通过', value: 1 }, { label: '不通过', value: 2 } ], @@ -583,7 +583,7 @@ export class DatatableOrderReportingComponent implements OnInit { filterCheckStatus(status: number) { switch (status) { case 0: - return '校验中'; + return '检测中'; case 1: return '通过'; case 2: @@ -594,4 +594,22 @@ export class DatatableOrderReportingComponent implements OnInit { } } + routeToOrder(item: any) { + if (item.billType === '1') { + window.open(location.origin + `/#/order-management/vehicle/vehicle-detail/${item.orderId}`); + } else { + window.open(location.origin + `/#/order-management/bulk/bulk-detail/${item.orderId}`); + } + } + + routeTowaybill(item: any) { + if (item.billType === '1') { + window.open(location.origin + `/#/waybill-management/vehicle/vehicle-detail/${item.waybillId}`); + + } else { + window.open(location.origin + `/#/waybill-management/bulk/bulk-detail/${item.waybillId}`); + + } + } + } 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 1cb10886..5b136434 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 @@ -50,10 +50,10 @@ export class DatatableReportingvViewTrackComponent implements OnInit { }); }); this.mapList = list; - this.addressItems = [...res.cityArray]; + this.addressItems = [...res.parkArray]; if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.vinOutTime); + item.parkBte = this.getLocalTime(item.parkBte); }); } } @@ -78,7 +78,7 @@ export class DatatableReportingvViewTrackComponent implements OnInit { this.addressItems = [...res.enclosureDataAppTrack]; if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { - item.vinOutTime = item.vinOutTime ? this.getLocalTime(item.gtm) : ''; + item.parkBte = item.parkBte ? this.getLocalTime(item.parkBte) : ''; item.cityName = item.appAdress; }); } diff --git a/src/app/routes/financial-management/services/freight-account.service.ts b/src/app/routes/financial-management/services/freight-account.service.ts index bbb7d5ee..bb736bb5 100644 --- a/src/app/routes/financial-management/services/freight-account.service.ts +++ b/src/app/routes/financial-management/services/freight-account.service.ts @@ -137,8 +137,6 @@ export class FreightAccountService extends ShipperBaseService { // 根据预收款ID获取核销信息明细 $api_get_advance_collection_hrxiao = '/api/fcc/ficoAhxH/getAhxHByYskblaId'; - - // 运营导出充值信息 充值记录导出 $api_get_exportPageByOperator = '/api/fcc/rechargeInfo/exportPageByOperator'; // 运营端导出交易流水明细 @@ -205,21 +203,22 @@ export class FreightAccountService extends ShipperBaseService { if (!url) { return; } - const uA = window.navigator.userAgent; // 判断浏览器内核 - const isIE = - /msie\s|trident\/|edge\//i.test(uA) && - !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window); - const objectUrl = url; - const a = document.createElement('a'); - document.body.appendChild(a); - a.href = objectUrl; - a.download = `回单.pdf`; - if (isIE) { - // 兼容IE11无法触发下载的问题 - (navigator as any).msSaveBlob(url, a.download); - } else { - a.click(); - } - a.remove(); + this.openURL(url); + // const uA = window.navigator.userAgent; // 判断浏览器内核 + // const isIE = + // /msie\s|trident\/|edge\//i.test(uA) && + // !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window); + // const objectUrl = url; + // const a = document.createElement('a'); + // document.body.appendChild(a); + // a.href = objectUrl; + // a.download = `回单.pdf`; + // if (isIE) { + // // 兼容IE11无法触发下载的问题 + // (navigator as any).msSaveBlob(url, a.download); + // } else { + // a.click(); + // } + // a.remove(); } } diff --git a/src/app/routes/insurance-management/services/insurance-management.service.ts b/src/app/routes/insurance-management/services/insurance-management.service.ts index a8b8b13b..0482f606 100644 --- a/src/app/routes/insurance-management/services/insurance-management.service.ts +++ b/src/app/routes/insurance-management/services/insurance-management.service.ts @@ -19,12 +19,11 @@ import { map } from 'rxjs/operators'; export class InsuranceManagementService extends ShipperBaseService { // 获取货主企业列表 public $api_enterpriceList = '/api/mdc/cuc/enterpriseInfo/operate/enterpriceList'; - // 查询保险费信息表 + // 查询保险费信息表 public $api_premiumInfo_list = '/api/sdc/premiumInfo/list/page'; - // 统计保险单状态数量 + // 统计保险单状态数量 public $api_listStatisticalStatus = '/api/sdc/premiumInfo/listStatisticalStatus'; - // 保险费公司认证 $api_get_submitAuthInfo = `/api/sdc/premiumInfo/submitAuthInfo`; // 退保费 @@ -36,24 +35,25 @@ export class InsuranceManagementService extends ShipperBaseService { if (!url) { return; } - const uA = window.navigator.userAgent; // 判断浏览器内核 - const isIE = - /msie\s|trident\/|edge\//i.test(uA) && - !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window); - const objectUrl = url; - const a = document.createElement('a'); - document.body.appendChild(a); - console.log('5555'); - - a.href = objectUrl; - a.download = '保单.pdf'; - if (isIE) { - // 兼容IE11无法触发下载的问题 - (navigator as any).msSaveBlob(url, a.download); - } else { - a.click(); - } - a.remove(); + this.openURL(url); + // const uA = window.navigator.userAgent; // 判断浏览器内核 + // const isIE = + // /msie\s|trident\/|edge\//i.test(uA) && + // !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window); + // const objectUrl = url; + // const a = document.createElement('a'); + // document.body.appendChild(a); + // console.log('5555'); + + // a.href = objectUrl; + // a.download = '保单.pdf'; + // if (isIE) { + // // 兼容IE11无法触发下载的问题 + // (navigator as any).msSaveBlob(url, a.download); + // } else { + // a.click(); + // } + // a.remove(); } constructor(public injector: Injector) { diff --git a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts index 29a61f01..70043520 100644 --- a/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts +++ b/src/app/routes/order-management/components/abnormal-warning/abnormal-warning.component.ts @@ -180,7 +180,7 @@ export class OrderManagementAbnormalWarningComponent implements OnInit { } } }, - carNos: { + carNo: { title: '车牌号', type: 'string', ui: { 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 450ff038..c2831b9f 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 @@ -76,8 +76,8 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { schema: SFSchema = {}; ui: SFUISchema = {}; logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' } + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' } ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, @@ -968,14 +968,15 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { points?.forEach((item: any) => { list.push({ name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; - this.addressItems = res?.cityArray; + this.addressItems = res?.parkArray; if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.vinOutTime); + item.parkBte = this.getLocalTime(item.parkBte); }); } } @@ -991,7 +992,8 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { points?.forEach((item: any) => { list.push({ name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; 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..5cd7cb57 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 14:06:21 + * @LastEditTime : 2022-04-13 19:02:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -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 @@
- +
- + +
@@ -222,9 +221,10 @@
- - + + +
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
@@ -232,21 +232,28 @@
  • 系统识别:{{item?.complianceTypeName}}
  • {{item?.determineDetails}}，您可在企业端提交申诉材料或联系客服。
    • -
  • 2021-11-07 03:20:15
+
- - + - - + + + {{item?.operator}}/{{item.telephone}} + + - +
暂无附件信息
@@ -255,4 +262,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 f69ffb9d..cfe20fdf 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 @@ -4,14 +4,14 @@ * @Author : Shiming * @Date : 2021-12-06 20:20:26 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 22:31:18 + * @LastEditTime : 2022-04-13 19:00:19 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail\\bulk-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ import { Router } from '@angular/router'; -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; -import { STColumn } from '@delon/abc/st'; +import { STColumn, STComponent } from '@delon/abc/st'; import { _HttpClient } from '@delon/theme'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -25,7 +25,8 @@ import format from 'date-fns/format'; styleUrls: ['./bulk-detail.component.less'] }) export class OrderManagementBulkeDetailComponent implements OnInit { - MapList: any[]=[]; + MapList: any[] = []; + @ViewChild('logSt') logSt!: STComponent; id = this.route.snapshot.params.id; billExpenses: any[] = []; //运费信息表格信息 pois: any[] = []; @@ -35,11 +36,20 @@ export class OrderManagementBulkeDetailComponent implements OnInit { totalObj: any; attObj: any; modalcontent: any; - modalTitle:string = ''; + modalTitle: string = ''; isVisible = false; logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' }, + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' } + ]; + logColumns3: STColumn[] = [ + { title: '时间', index: 'warningTime' }, + { title: '异常预警类型', index: 'warningTypeLabel' } + ]; + operateLogColums: STColumn[] = [ + { title: '内容', index: 'operationContent' }, + { title: '操作人', render: 'operator' }, + { title: '操作时间', index: 'operatorTimestamp' }, ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, @@ -61,21 +71,23 @@ export class OrderManagementBulkeDetailComponent implements OnInit { } } ]; + get logParams() { + return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } + } trajectory = 'car'; - mapList:any[] = []; //地图点位数据组 - addressItems:any[] = []; //打点地址数据组 + mapList: any[] = []; //地图点位数据组 + addressItems: any[] = []; //打点地址数据组 + warringList: any[] = []; //打点地址数据组 constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, - private service: OrderManagementService, + public service: OrderManagementService, private router: Router, private modal: NzModalService - ) { - } + ) {} ngOnInit(): void { console.log(this.route?.snapshot?.queryParams?.sts); - this.initData(); this.getTrajectory(); } @@ -85,36 +97,45 @@ export class OrderManagementBulkeDetailComponent implements OnInit { if (res) { this.i = res; this.billExpenses = this.i?.billExpenseDetails?.filter((data: any) => data.expenseCode === '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'); this.pois = [ { - markerLabel: '起', + markerLabel: '装', color: 'blue', position: [res.startingPoint.longitude, res.startingPoint.latitude], - title: res.startingPoint.detailedAddress + title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area || ''}${ + res.startingPoint.detailedAddress + }`, + time: '计划出发时间：' + res.loadPlanTime }, { markerLabel: '卸', color: 'red', position: [res.endPoint.longitude, res.endPoint.latitude], - title: res.endPoint.detailedAddress + title: `卸货地：${res.endPoint.province}${res.endPoint.city}${res.endPoint.area}${res.endPoint.detailedAddress}`, + time: '计划卸货时间：' + res.unloadPlanTime } ]; + } }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { if (res) { - console.log('风险详情') - console.log(res) - this.abnormalList = res + console.log('风险详情'); + console.log(res); + this.abnormalList = res; } }); this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => { if (res) { - console.log('异常预警') - console.log(res) + console.log('异常预警'); + console.log(res); + this.warringList = res } }); + setTimeout(() => { + this.logSt.load(1); + }); } goBack() { @@ -125,11 +146,12 @@ export class OrderManagementBulkeDetailComponent implements OnInit { this.router.navigate(['order-management/bulk-detailChange', this.id]); } agreement(value: any) { - if(value ==='1'){ + if (value === '1') { this.modalTitle = '附件信息'; // this.modalcontent = this.i?.contractContent?.contractContent; - this.service.reviewPDF(this.i?.contractContent?.contractFilePath) - }else if(value === '2'){ + // this.service.reviewPDF(this.i?.contractContent?.contractFilePath) + this.service.openURL(this.i?.contractContent?.contractFilePath); + } else if (value === '2') { this.modalTitle = '补充协议'; this.modalcontent = this.i?.supplementContent?.contractContent; this.isVisible = true; @@ -163,43 +185,45 @@ export class OrderManagementBulkeDetailComponent implements OnInit { } // 获取车辆轨迹 - 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, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; - this.addressItems = res.cityArray; - if(this.addressItems && this.addressItems.length > 0){ + this.addressItems = res.parkArray; + if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.vinOutTime); + item.parkBte = this.getLocalTime(item.parkBte); }); } } }); } - // 获取司机轨迹 - 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, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; this.addressItems = [...res.enclosureDataAppTrack]; - if(this.addressItems && this.addressItems.length > 0){ + if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { item.vinOutTime = this.getLocalTime(item.gtm); item.cityName = item.appAdress; @@ -207,14 +231,14 @@ export class OrderManagementBulkeDetailComponent implements OnInit { } } }); - } - 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/order-management/components/complaint-detail/complaint-detail.component.html b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html index ecc0d4a2..a9a97694 100644 --- a/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html +++ b/src/app/routes/order-management/components/complaint-detail/complaint-detail.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-04 17:29:18 * @LastEditors : Shiming - * @LastEditTime : 2022-03-29 16:26:09 + * @LastEditTime : 2022-04-13 10:50:02 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\complaint-detail\\complaint-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -24,8 +24,12 @@

投诉单号：{{datailList?.complaintCode}}

- + + + + diff --git a/src/app/routes/order-management/components/risk/risk.component.ts b/src/app/routes/order-management/components/risk/risk.component.ts index dabb3c30..898ad94a 100644 --- a/src/app/routes/order-management/components/risk/risk.component.ts +++ b/src/app/routes/order-management/components/risk/risk.component.ts @@ -88,7 +88,7 @@ export class OrderManagementRiskComponent implements OnInit { this.loading = false return data.map(item => ({ ...item, - disabled: item.auditStatus !== '1' + disabled: item.representationsStatus !== '2' })); }; search() { @@ -202,15 +202,28 @@ export class OrderManagementRiskComponent implements OnInit { } as SFSelectWidgetSchema }, shipperId: { - title: '托运人', type: 'string', + title: '托运人', ui: { - widget: 'dict-select', - params: { dictKey: 'BulkFreightUnitPriceType' }, - containsAllLabel: true, + widget: 'select', + serverSearch: true, + searchDebounceTime: 300, + searchLoadingText: '搜索中...', + allowClear: true, visibleIf: { _$expand: (value: boolean) => value - } + }, + onSearch: (q: any) => { + let str =q.replace(/^\s+|\s+$/g,""); + if (str) { + return this.service + .request(this.service.$api_enterpriceList, { enterpriseName: str }) + .pipe(map((res: any) => (res as any[]).map(i => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum)))) + .toPromise(); + } else { + return of([]); + } + }, } as SFSelectWidgetSchema }, enterpriseInfoId: { 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 0bc13d3a..3c75bab5 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 @@ -90,8 +90,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { mapList: any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' } + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' } ]; constructor( private route: ActivatedRoute, @@ -923,14 +923,15 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { points?.forEach((item: any) => { list.push({ name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; - this.addressItems = res?.cityArray; + this.addressItems = res?.parkArray; if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.vinOutTime); + item.parkBte = this.getLocalTime(item.parkBte); }); } } @@ -946,7 +947,8 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { points?.forEach((item: any) => { list.push({ name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; 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..8fb28115 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-08 14:06:27 + * @LastEditTime : 2022-04-13 19:04:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -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 @@
- +
- + +
@@ -246,33 +229,36 @@

- + +
您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您!
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
  • 系统识别:{{ item?.complianceTypeName }}
  • {{ item?.determineDetails }}，您可在企业端提交申诉材料或联系客服。
    • -
  • 2021-11-07 03:20:15
+
- + - + + + {{item?.operator}}/{{item.telephone}} + + - +
暂无附件信息
@@ -281,4 +267,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 099775a6..a113356d 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 @@ -4,13 +4,13 @@ * @Author : Shiming * @Date : 2021-12-28 14:42:03 * @LastEditors : Shiming - * @LastEditTime : 2022-04-06 15:12:10 + * @LastEditTime : 2022-04-13 19:06:44 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail\\vehicle-detail.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STColumn } from '@delon/abc/st'; +import { STColumn, STComponent } from '@delon/abc/st'; import { NzCardComponent } from 'ng-zorro-antd/card'; import { NzMessageService } from 'ng-zorro-antd/message'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -23,12 +23,14 @@ import { OrderManagementService } from '../../services/order-management.service' }) export class OrderManagementVehicleDetailComponent implements OnInit { id = this.route.snapshot.params.id; + @ViewChild('logSt') logSt!: STComponent; modalcontent: any; - modalTitle:string = ''; + modalTitle: string = ''; trajectory = 'car'; mapList: any[] = []; //地图点位数据组 pois: any[] = []; addressItems: any[] = []; //打点地址数据组 + warringList: any[] = []; //打点地址数据组 abnormalList: any[] = []; i: any = { unLoadingPlaceList: [], @@ -43,8 +45,17 @@ export class OrderManagementVehicleDetailComponent implements OnInit { approvalLsit: any; isVisible = false; logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' } + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' } + ]; + logColumns3: STColumn[] = [ + { title: '时间', index: 'warningTime' }, + { title: '异常预警类型', index: 'warningTypeLabel' } + ]; + operateLogColums: STColumn[] = [ + { title: '内容', index: 'operationContent' }, + { title: '操作人', render: 'operator' }, + { title: '操作时间', index: 'operatorTimestamp' }, ]; logColumns: STColumn[] = [ { title: '款项', index: 'expenseCodeLabel' }, @@ -55,13 +66,14 @@ export class OrderManagementVehicleDetailComponent implements OnInit { { title: '支付状态', className: 'text-center', - index: 'paymentStatusLabel', + index: 'paymentStatusLabel' } ]; + constructor( public route: ActivatedRoute, private msgSrv: NzMessageService, - private service: OrderManagementService, + public service: OrderManagementService, private router: Router, private modal: NzModalService ) {} @@ -70,23 +82,29 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.initData(); this.getTrajectory(); } - + get logParams() { + return { operateObject: this.i?.billCode, operateTypeList: ['3','8'] } + } initData() { this.service.request(this.service.$api_get_getWholeBillDetail, { id: this.id }).subscribe(res => { if (res) { this.i = res; this.pois = [ { - markerLabel: '起', + markerLabel: '装', color: 'blue', position: [res.startingPoint.longitude, res.startingPoint.latitude], - title: res.startingPoint.detailedAddress + title: `发货地：${res.startingPoint.province}${res.startingPoint.city}${res.startingPoint.area || ''}${ + res.startingPoint.detailedAddress + }`, + time: '计划出发时间：' + res.loadPlanTime }, { markerLabel: '卸', color: 'red', position: [res.endPoint.longitude, res.endPoint.latitude], - title: res.endPoint.detailedAddress + title: `卸货地：${res.endPoint.province}${res.endPoint.city}${res.endPoint.area}${res.endPoint.detailedAddress}`, + time: '计划卸货时间：' + res.unloadPlanTime } ]; this.billExpenses = this.i?.billExpenseDetails?.filter( @@ -97,17 +115,21 @@ export class OrderManagementVehicleDetailComponent implements OnInit { }); this.service.request(this.service.$api_listBillComplianceAbnormalByBillId, { id: this.id }).subscribe(res => { if (res) { - console.log('风险详情') - console.log(res) - this.abnormalList = res + console.log('风险详情'); + console.log(res); + this.abnormalList = res; } }); this.service.request(this.service.$api_getAbnormalWarningByBillId, { id: this.id }).subscribe(res => { if (res) { - console.log('异常预警') - console.log(res) + console.log('异常预警'); + console.log(res); + this.warringList = res } }); + setTimeout(() => { + this.logSt.load(1); + }); } // 取消订单 cancellation() { @@ -132,15 +154,15 @@ export class OrderManagementVehicleDetailComponent implements OnInit { this.router.navigate(['order-management/vehicle-detailChange', this.id]); } agreement(value: any) { - if(value ==='1'){ - this.modalTitle = '附件信息'; - this.modalcontent = this.i?.contractContent?.contractContent; - - }else if(value === '2'){ + if (value === '1') { + // this.modalTitle = '附件信息'; + // this.modalcontent = this.i?.contractContent?.contractContent; + this.service.openURL(this.i?.contractContent?.contractFilePath); + } else if (value === '2') { this.modalTitle = '补充协议'; this.modalcontent = this.i?.supplementContent?.contractContent; + this.isVisible = true; } - this.isVisible = true; } handleCancel() { this.isVisible = false; @@ -163,16 +185,16 @@ export class OrderManagementVehicleDetailComponent implements OnInit { let list: any[] = []; points?.forEach((item: any) => { list.push({ - name: `${item.spd}km/h`, + name: `${item.spd}`, lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], time: item.gtm }); }); this.mapList = list; - this.addressItems = res.cityArray; + this.addressItems = res.parkArray; if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.vinOutTime); + item.parkBte = this.getLocalTime(item.parkBte); }); } } @@ -188,7 +210,8 @@ export class OrderManagementVehicleDetailComponent implements OnInit { points?.forEach((item: any) => { list.push({ name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; @@ -210,6 +233,9 @@ export class OrderManagementVehicleDetailComponent implements OnInit { } } getLocalTime(time: any) { + if (!time) { + return ''; + } return format(new Date(parseInt(time)), 'yyyy-MM-dd HH:mm:ss'); } } 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 64dff652..976896dc 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 @@ -38,8 +38,8 @@ export class OneCarOrderViewtrackComponent implements OnInit { mapList:any[] = []; //地图点位数据组 addressItems: any[] = []; //打点地址数据组 logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' }, + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' }, ]; constructor( private modalRef: NzModalRef, @@ -65,14 +65,15 @@ export class OneCarOrderViewtrackComponent implements OnInit { points?.forEach((item: any) => { list.push({ name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; - this.addressItems = res.cityArray; + this.addressItems = res.parkAdr; if(this.addressItems && this.addressItems.length > 0){ this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.vinOutTime); + item.parkBte = this.getLocalTime(item.parkBte); }); } } @@ -88,7 +89,8 @@ export class OneCarOrderViewtrackComponent implements OnInit { points?.forEach((item: any) => { list.push({ name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; 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 607a26a9..f8cd497c 100644 --- a/src/app/routes/order-management/services/order-management.service.ts +++ b/src/app/routes/order-management/services/order-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 15:31:52 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 22:29:34 + * @LastEditTime : 2022-04-13 18:52:24 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\services\\order-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -52,7 +52,7 @@ export class OrderManagementService extends ShipperBaseService { // 订单申请撤销 $api_get_revokeChangeRecord = `/api/sdc/billFreightChangeApplication/revokeChangeRecord`; // 运费变更申请-整车 - $api_get_insertFreightChangeWhole = `/api/sdc/billFreightChangeApplication/insertFreightChangeWhole`; + $api_get_insertFreightChangeWhole = `/api/sdc/billFreightChangeApplication/insertOperateFreightChangeWhole`; // 取消订单 $api_get_cancelAnOrder = `/api/sdc/billOperate/cancelAnOrder`; // 批量签收整车订单 @@ -92,7 +92,7 @@ export class OrderManagementService extends ShipperBaseService { //运费变更申请计算费用-整车 $api_getWholeSurchargeDetail = `/api/sdc/billFreightChangeApplication/getWholeSurchargeDetail`; //运费变更申请-大宗 - $api_change_bulk = `/api/sdc/billFreightChangeApplication/insertFreightChangeBulk`; + $api_change_bulk = `/api/sdc/billFreightChangeApplication/insertOperateFreightChangeBulk`; // 删除装卸货信息 $api_delete_Wholedeletebatch = `/api/sdc/unLoadingPlace/deletebatch`; // 修改-大宗订单 @@ -188,7 +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`; @@ -197,13 +197,15 @@ export class OrderManagementService extends ShipperBaseService { // 异步导出风险单导出 $api_get_asyncExportRiskBillList = `/api/sdc/billRiskOperate/asyncExportRiskBillList`; // 异步导出合规抽查导出 - $api_get_asyncExportSpotCheckList= `/api/sdc/BillComplianceSpotCheck/asyncExportSpotCheckList`; + $api_get_asyncExportSpotCheckList = `/api/sdc/BillComplianceSpotCheck/asyncExportSpotCheckList`; // 异步导出单据审核导出 - $api_get_asyncExportExamineBillList= `/api/sdc/billExamine/asyncExportExamineBillList`; + $api_get_asyncExportExamineBillList = `/api/sdc/billExamine/asyncExportExamineBillList`; // 异步导出单据审核导出 - $api_abnormalWarning_asyncExport= `/api/sdc/abnormalWarning/asyncExport`; + $api_abnormalWarning_asyncExport = `/api/sdc/abnormalWarning/asyncExport`; // 异步导出投诉管理导出 - $api_asyncExportComplaintListDrv= `/api/sdc/complaint/operate/asyncExportComplaintListDrv`; + $api_asyncExportComplaintListDrv = `/api/sdc/complaint/operate/asyncExportComplaintListDrv`; + //操作日志 + public $api_get_log_list = `/api/mdc/pbc/operationLogRecords/getOperationLogRecordsList`; /** * 根据企业ID，获取企业历史网络货运人 * @returns @@ -248,21 +250,22 @@ export class OrderManagementService extends ShipperBaseService { if (!url) { return; } - const uA = window.navigator.userAgent; // 判断浏览器内核 - const isIE = - /msie\s|trident\/|edge\//i.test(uA) && - !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window); - const objectUrl = url; - const a = document.createElement('a'); - document.body.appendChild(a); - a.href = objectUrl; - a.download = '附件.pdf'; - if (isIE) { - // 兼容IE11无法触发下载的问题 - (navigator as any).msSaveBlob(url, a.download); - } else { - a.click(); - } - a.remove(); + this.openURL(url); + // const uA = window.navigator.userAgent; // 判断浏览器内核 + // const isIE = + // /msie\s|trident\/|edge\//i.test(uA) && + // !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window); + // const objectUrl = url; + // const a = document.createElement('a'); + // document.body.appendChild(a); + // a.href = objectUrl; + // a.download = '附件.pdf'; + // if (isIE) { + // // 兼容IE11无法触发下载的问题 + // (navigator as any).msSaveBlob(url, a.download); + // } else { + // a.click(); + // } + // a.remove(); } } diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index 3f4f76a1..00606c3d 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -124,7 +124,7 @@
-

到货后{{ i?.paymentDays }}天内支付运费

+

收货后{{ i?.paymentDays }}天内支付运费

{{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}

diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html index 7e3d5937..fc4ad284 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.html @@ -11,52 +11,33 @@ -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
+
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
- 装货地 + 装货地
- +
- 联系人 + 联系人
- + - +
@@ -64,50 +45,32 @@
- +
- 卸货地 + 卸货地
- +
- 联系人 + 联系人
- + - +
@@ -122,16 +85,26 @@
货物信息
- + + + + + + 国家法规及行政命令禁限运货物不能托运 + 《禁运物品说明》 + + + - + - + + @@ -142,9 +115,8 @@ - +

例如 付司机运费 = 重量*单价 = 999.99

保留小数，即 999.99

@@ -155,35 +127,20 @@ - + - + - + @@ -198,15 +155,10 @@
-
+
- +
 天内支付运费 @@ -220,9 +172,12 @@
- - + + - +
diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less index 193ba9aa..a2ab5fbc 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.less @@ -3,10 +3,35 @@ nz-input-number { width: 100%; } + nz-date-picker { width: 100%; } + + .sf3 { + .goods_Tips_item { + .goods_tips { + width: calc(50% - 45px); + + .ant-alert { + padding: 0 0 0 2px; + } + + } + + nz-form-item { + margin-bottom: 8px; + } + + // .ant-form-item-control-input-content { + // display: flex; + // justify-content: end; + // } + } + } } + + i { cursor: pointer; } @@ -34,7 +59,10 @@ padding: 24px; color: #7d7d7d; font-size: 30px; - :hover{color: #52acff;} + + :hover { + color: #52acff; + } } #container { @@ -45,6 +73,7 @@ input[type='number'] { -moz-appearance: textfield; } + input[type='number']::-webkit-inner-spin-button, input[type='number']::-webkit-outer-spin-button { margin: 0; diff --git a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts index 722bb487..733bddf3 100644 --- a/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts +++ b/src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts @@ -210,6 +210,17 @@ export class SupplyManagementBulkPublishComponent implements OnInit { initSF3() { this.schema3 = { properties: { + goodsTips: { + type: 'string', + title: '', + ui: { + widget: 'custom', + class: 'goods_Tips_item', + // visibleIf: { + // goodsTypeName: (value: any) => value && value === '其它' + // } + } + }, goodsTypeId: { type: 'string', title: '货物名称', @@ -271,6 +282,9 @@ export class SupplyManagementBulkPublishComponent implements OnInit { errors: { required: '请填写货物名称' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' + }, + blur: (value: any) => { + this.checkGoodsName(); } } } @@ -281,6 +295,9 @@ export class SupplyManagementBulkPublishComponent implements OnInit { '*': { spanLabelFixed: 90, grid: { span: 12 } + }, + $goodsTips: { + grid: { span: 24 } } }; } @@ -583,7 +600,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } subStartInfo(event: any, index: number, id?: any) { if (id) { - this.service.request(this.service.$api_delete_Wholedeletebatch, [id]).subscribe(res => {}); + this.service.request(this.service.$api_delete_Wholedeletebatch, [id]).subscribe(res => { }); } this.startInfo.splice(index, 1); this.validateForm1.removeControl(`loadAddress${index}`); @@ -611,7 +628,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit { } subEndInfo(event: any, index: number, id?: any) { if (id) { - this.service.request(this.service.$api_delete_Wholedeletebatch, [id]).subscribe(res => {}); + this.service.request(this.service.$api_delete_Wholedeletebatch, [id]).subscribe(res => { }); } this.endInfo.splice(index, 1); this.validateForm1.removeControl(`unloadAddress${index}`); @@ -838,43 +855,43 @@ export class SupplyManagementBulkPublishComponent implements OnInit { nzContent: AmapPoiPickerComponent, nzWidth: 900, nzOnOk: item => { - if(item?.poi) { - const poi = item.poi; - const locList = poi.location.toString().split(','); - switch (type) { - case 'start': - 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.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.district + poi.name; - this.endInfo[index].longitude = locList[0]; - this.endInfo[index].latitude = locList[1]; - 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; - } + if (item?.poi) { + const poi = item.poi; + const locList = poi.location.toString().split(','); + switch (type) { + case 'start': + 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.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.district + poi.name; + this.endInfo[index].longitude = locList[0]; + this.endInfo[index].latitude = locList[1]; + 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; + } - 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: any) => { + this.totalDistance = res.distance; + this.totalTime = res.time; + }); + } + return true + } else { + this.service.msgSrv.warning('请重新手动选择地址！') + return false } - return true - } else { - this.service.msgSrv.warning('请重新手动选择地址！') - return false - } } }); } @@ -1127,4 +1144,20 @@ export class SupplyManagementBulkPublishComponent implements OnInit { }; }); } + checkGoodsName() { + const name = this.sf3.getValue('/goodsName1'); + if (!name || name.trim().length === 0) { + return; + } + this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { + if (res === false) { + const modalRef = this.modalService.error({ + nzTitle: '货物名称含有违禁词，请重新输入！', + }); + modalRef.afterClose.subscribe(result => { + // this.sf3.setValue('/goodsName1', null); + }); + } + }); + } } diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html index 7eb10959..3c489ffb 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html @@ -11,60 +11,37 @@ -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
+
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
- 装货地 + 装货地
- + - - + +
- 联系人 + 联系人
- + - +
@@ -81,59 +58,38 @@
- +
- 卸货地 + 卸货地
- + - - + +
- 联系人 + 联系人
- + - +
@@ -152,24 +108,20 @@
- 装货时间 + 装货时间 - +
- 卸货时间 + 卸货时间 - +
@@ -182,31 +134,40 @@
货物信息
- + + + + + + 国家法规及行政命令禁限运货物不能托运 + 《禁运物品说明》 + + +
- + - + - +
-
@@ -233,8 +194,8 @@ - ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 + ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》
@@ -256,18 +217,21 @@
- + - + - + {{ i.value | currency }} @@ -276,14 +240,14 @@ {{ i.value | currency }}
-
- -
-
-  天内支付运费 -
+
+ +
+
+  天内支付运费 +
@@ -293,12 +257,12 @@
- - - + + +
diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less index 35b08935..a445eacf 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.less @@ -3,10 +3,35 @@ nz-input-number { width: 100%; } + nz-date-picker { width: 94.3%; } + + .sf3 { + .goods_Tips_item { + .goods_tips { + width: calc(50% - 45px); + + .ant-alert { + padding: 0 0 0 2px; + } + + } + + nz-form-item { + margin-bottom: 8px; + } + + // .ant-form-item-control-input-content { + // display: flex; + // justify-content: end; + // } + } + } + } + i { cursor: pointer; } @@ -34,7 +59,10 @@ padding: 24px; color: #7d7d7d; font-size: 30px; - :hover{color: #52acff;} + + :hover { + color: #52acff; + } } #container { @@ -45,11 +73,13 @@ input[type='number'] { -moz-appearance: textfield; } + input[type='number']::-webkit-inner-spin-button, input[type='number']::-webkit-outer-spin-button { margin: 0; -webkit-appearance: none; } + .hides { margin-left: 10px; color: aqua; diff --git a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts index 107e87f5..9795724f 100644 --- a/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts +++ b/src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts @@ -262,6 +262,17 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { initSF3() { this.schema3 = { properties: { + goodsTips: { + type: 'string', + title: '', + ui: { + widget: 'custom', + class: 'goods_Tips_item', + // visibleIf: { + // goodsTypeName: (value: any) => value && value === '其它' + // } + } + }, goodsTypeId: { type: 'string', title: '货物名称', @@ -323,6 +334,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { errors: { required: '请填写货物名称' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' + }, + blur: (value: any) => { + this.checkGoodsName(); } } } @@ -333,6 +347,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { '*': { spanLabelFixed: 90, grid: { span: 12 } + }, + $goodsTips: { + grid: { span: 24 } } }; } @@ -465,10 +482,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ) }, change: (tag: any, org: any) => { - if(tag === '3'){ + if (tag === '3') { this.sf5.setValue('/insurancePremium', null); this.sf5.setValue('/insuranceRate', null); - }else { + } else { this.getInsurersPrice(tag); } } @@ -481,7 +498,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ui: { widget: 'custom', visibleIf: { insuranceType: (value: string) => value === '0' } - } , + }, }, type2: { type: 'string', @@ -494,7 +511,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { insurancePremium: { type: 'string', title: '服务包费用', - readOnly:true, + readOnly: true, ui: { visibleIf: { insuranceType: (value: string) => value !== '3' } } @@ -523,7 +540,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { } }, }, - required: [ 'insurancePremium'] + required: ['insurancePremium'] }; this.ui5 = { '*': { @@ -733,7 +750,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.service .request( this.service.$api_getAdditionalRate + - `?shipperId=${this?.sf1?.value?.shipperAppUserId || ''}&enterpriseInfoId=${items}&resourcetype='1'` + `?shipperId=${this?.sf1?.value?.shipperAppUserId || ''}&enterpriseInfoId=${items}&resourcetype='1'` ) .subscribe(res => { if (res) { @@ -986,9 +1003,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { ]; // 运费信息 const expenseList = [ - { expenseCode: 'PRE', expenseName: '预付', price: this.sf7.value.prePay || 0, id: this.sf7data?.prePayId || '' ,resourceId: this.sf7data?.PREresourceId || '' }, - { expenseCode: 'RECE', expenseName: '到付', price: this.sf7.value.toPay || 0, id: this.sf7data?.toPayId || '' ,resourceId: this.sf7data?.RECEresourceId || ''}, - { expenseCode: 'BACK', expenseName: '回单付', price: this.sf7.value.receiptPay || 0, id: this.sf7data?.receiptPayId || '' ,resourceId: this.sf7data?.BACKresourceId || ''} + { expenseCode: 'PRE', expenseName: '预付', price: this.sf7.value.prePay || 0, id: this.sf7data?.prePayId || '', resourceId: this.sf7data?.PREresourceId || '' }, + { expenseCode: 'RECE', expenseName: '到付', price: this.sf7.value.toPay || 0, id: this.sf7data?.toPayId || '', resourceId: this.sf7data?.RECEresourceId || '' }, + { expenseCode: 'BACK', expenseName: '回单付', price: this.sf7.value.receiptPay || 0, id: this.sf7data?.receiptPayId || '', resourceId: this.sf7data?.BACKresourceId || '' } ]; // 从“再下一单”过来，将所有的子参数内的id都删除 if (this.PageStatus === '整车下一单') { @@ -1017,8 +1034,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { paymentDays: this.sf7.value.paymentDays, estimatedKilometers: this.totalDistance, estimatedTravelTime: this.totalTime, - subtotal :this.sf7.value.subtotal, - total:this.sf7.value.total, + subtotal: this.sf7.value.subtotal, + total: this.sf7.value.total, insurancePackagedGoods: this.sf4.value.insurancePackagedGoods, goodsValue: this.sf4.value.goodsValue }; @@ -1081,7 +1098,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { nzWidth: 900, nzOnOk: item => { console.log(item); - if(item?.poi) { + if (item?.poi) { const poi = item.poi; const locList = poi.pois; switch (type) { @@ -1106,7 +1123,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { 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; @@ -1114,10 +1131,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.getInsurersPrice(); // 计算保费金额 }); } - return true + return true } else { this.service.msgSrv.warning('请重新手动选择地址！') - return false + return false } } }); @@ -1155,7 +1172,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { this.totalDistance = res?.estimatedKilometers; this.totalTime = res?.estimatedTravelTime; this.sf1data = { - resourceCode:res?.resourceCode || '', + resourceCode: res?.resourceCode || '', enterpriseInfoName: res?.enterpriseInfoName, enterpriseInfoId: res?.enterpriseInfoId, dispatchPhone: res?.dispatchPhone, @@ -1423,7 +1440,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { // 计算保价费金额 getInsurersPrice(insuranceType = this.sf5.value.insuranceType) { console.log(this.totalDistance); - if (insuranceType !== '3' && this.totalDistance > 0) { + if (insuranceType !== '3' && this.totalDistance > 0) { const params = { insuranceType, goodsValue: this.sf4.value.goodsValue, @@ -1440,14 +1457,31 @@ export class SupplyManagementOnecarPublishComponent implements OnInit { }); } } - // 运费信息价格变更 - priceChange(event:any, i:any){ - i.setValue(event); - if(event>=99999){ - this.modalService.warning({ - nzTitle: '可输入的最大金额为99999元', + // 运费信息价格变更 + priceChange(event: any, i: any) { + i.setValue(event); + if (event >= 99999) { + this.modalService.warning({ + nzTitle: '可输入的最大金额为99999元', + }); + } + this.payChange() + } + + checkGoodsName() { + const name = this.sf3.getValue('/goodsName1'); + if (!name || name.trim().length === 0) { + return; + } + this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { + if (res === false) { + const modalRef = this.modalService.error({ + nzTitle: '货物名称含有违禁词，请重新输入！', + }); + modalRef.afterClose.subscribe(result => { + // this.sf3.setValue('/goodsName1', null); }); } - this.payChange() - } + }); + } } diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.html b/src/app/routes/supply-management/components/release-publish/release-publish.component.html index b3be726e..efdb686f 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.html +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.html @@ -7,15 +7,13 @@
货源单设置
- - {{ i.value }} - + + {{ i.value }} + -
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
+
装卸货信息预计公里数：{{ totalDistance }}km，预计行程耗时：{{ totalTime }}小时
@@ -26,47 +24,26 @@
- + - - + +
- 联系人 + 联系人
- + - +
@@ -83,59 +60,38 @@
- +
- 卸货地 + 卸货地
- + - - + +
- 联系人 + 联系人
- + - +
@@ -156,22 +112,18 @@ 装货时间 - +
- 卸货时间 + 卸货时间 - +
@@ -184,31 +136,40 @@
货物信息
- + + + + + + 国家法规及行政命令禁限运货物不能托运 + 《禁运物品说明》 + + +
- + - + - +
-
@@ -235,8 +196,8 @@ - ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》 + ①香港、澳门、台湾、西藏、新疆不予承保，②单次运输保额仅限200万元以内，③保险详细内容及注意事项请见《保险告知函》
@@ -257,18 +218,21 @@
- + - + - + {{ i.value | currency }} @@ -277,14 +241,14 @@ {{ i.value | currency }}
-
- -
-
-  天内支付运费 -
+
+ +
+
+  天内支付运费 +
@@ -293,7 +257,9 @@
- - + +
diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.less b/src/app/routes/supply-management/components/release-publish/release-publish.component.less index f6d4bb4f..b34cbcc9 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.less +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.less @@ -3,10 +3,34 @@ nz-input-number { width: 100%; } + nz-date-picker { width: 94.3%; } + + .sf3 { + .goods_Tips_item { + .goods_tips { + width: calc(50% - 45px); + + .ant-alert { + padding: 0 0 0 2px; + } + + } + + nz-form-item { + margin-bottom: 8px; + } + + // .ant-form-item-control-input-content { + // display: flex; + // justify-content: end; + // } + } + } } + i { cursor: pointer; } @@ -34,7 +58,10 @@ padding: 24px; color: #7d7d7d; font-size: 30px; - :hover{color: #52acff;} + + :hover { + color: #52acff; + } } #container { @@ -45,6 +72,7 @@ input[type='number'] { -moz-appearance: textfield; } + input[type='number']::-webkit-inner-spin-button, input[type='number']::-webkit-outer-spin-button { margin: 0; diff --git a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts index 4b8b2798..6683e303 100644 --- a/src/app/routes/supply-management/components/release-publish/release-publish.component.ts +++ b/src/app/routes/supply-management/components/release-publish/release-publish.component.ts @@ -237,6 +237,17 @@ export class SupplyManagementReleasePublishComponent implements OnInit { initSF3() { this.schema3 = { properties: { + goodsTips: { + type: 'string', + title: '', + ui: { + widget: 'custom', + class: 'goods_Tips_item', + // visibleIf: { + // goodsTypeName: (value: any) => value && value === '其它' + // } + } + }, goodsTypeId: { type: 'string', title: '货物名称', @@ -298,6 +309,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { errors: { required: '请填写货物名称' }, visibleIf: { goodsTypeName: (value: any) => value && value === '其它' + }, + blur: (value: any) => { + this.checkGoodsName(); } } } @@ -308,6 +322,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { '*': { spanLabelFixed: 115, grid: { span: 12 } + }, + $goodsTips: { + grid: { span: 24 } } }; } @@ -436,13 +453,13 @@ export class SupplyManagementReleasePublishComponent implements OnInit { map((res: any) => { return [...res]; }) - ) + ); }, change: (tag: any, org: any) => { - if(tag === '3'){ + if (tag === '3') { this.sf5.setValue('/insurancePremium', null); this.sf5.setValue('/insuranceRate', null); - }else { + } else { this.getInsurersPrice(tag); } } @@ -455,7 +472,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { ui: { widget: 'custom', visibleIf: { insuranceType: (value: string) => value === '0' } - } , + } }, type2: { type: 'string', @@ -468,7 +485,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { insurancePremium: { type: 'string', title: '服务包费用', - readOnly:true, + readOnly: true, ui: { visibleIf: { insuranceType: (value: string) => value !== '3' } } @@ -495,9 +512,9 @@ export class SupplyManagementReleasePublishComponent implements OnInit { widget: 'custom', visibleIf: { insuranceType: (value: string) => value === '1' } } - }, + } }, - required: [ 'insurancePremium'] + required: ['insurancePremium'] }; this.ui5 = { '*': { @@ -562,8 +579,12 @@ export class SupplyManagementReleasePublishComponent implements OnInit { receiptUserPhone: { type: 'string', title: '联系电话', + format: 'mobile', maxLength: 11, ui: { + errors: { + format: '请输入正确联系电话格式' + }, visibleIf: { receiptType: value => value === '2' } @@ -741,9 +762,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit { this.service .request( this.service.$api_getAdditionalRate + - `?shipperId=${this?.sf1.value?.shipperAppUserId || ''}&enterpriseInfoId=${ - this?.sf1.value?.enterpriseInfoName || '' - }&resourcetype='1'` + `?shipperId=${this?.sf1.value?.shipperAppUserId || ''}&enterpriseInfoId=${this?.sf1.value?.enterpriseInfoName || '' + }&resourcetype='1'` ) .subscribe(res => { if (res) { @@ -955,8 +975,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit { ...this.sf6.value, expenseDTOList: expenseList, paymentDays: this.sf7.value.paymentDays, - subtotal :this.sf7.value.subtotal, - total:this.sf7.value.total, + subtotal: this.sf7.value.subtotal, + total: this.sf7.value.total, estimatedKilometers: this.totalDistance, estimatedTravelTime: this.totalTime, insurancePackagedGoods: this.sf4.value.insurancePackagedGoods, @@ -999,42 +1019,42 @@ export class SupplyManagementReleasePublishComponent implements OnInit { nzContent: AmapPoiPickerComponent, nzWidth: 900, nzOnOk: item => { - if(item?.poi) { - 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 (item?.poi) { + 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]?.detailedAddress && this.endInfo[0]?.detailedAddress) { + this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { + this.totalDistance = res.distance; + this.totalTime = res.time; + this.getInsurersPrice(); // 计算保费金额 + }); + } + return true; + } else { + this.service.msgSrv.warning('请重新手动选择地址！'); + return false; } - // 计算里程，时间 - if (this.startInfo[0]?.detailedAddress && this.endInfo[0]?.detailedAddress) { - this.amapService.drivingCompute([...this.startInfo], [...this.endInfo]).subscribe(res => { - this.totalDistance = res.distance; - this.totalTime = res.time; - this.getInsurersPrice(); // 计算保费金额 - }); - } - return true - } else { - this.service.msgSrv.warning('请重新手动选择地址！') - return false - } } }); } @@ -1193,7 +1213,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit { getInsurersPrice(insuranceType = this.sf5.value?.insuranceType) { console.log(insuranceType); console.log(this.totalDistance); - if (insuranceType !== '3' && this.totalDistance > 0) { + if (insuranceType !== '3' && this.totalDistance > 0) { const params = { insuranceType, goodsValue: this.sf4.value.goodsValue, @@ -1210,14 +1230,31 @@ export class SupplyManagementReleasePublishComponent implements OnInit { }); } } - // 运费信息价格变更 - priceChange(event:any, i:any){ - i.setValue(event); - if(event>=99999){ - this.modalService.warning({ - nzTitle: '可输入的最大金额为99999元', - }); - } - this.payChange() + // 运费信息价格变更 + priceChange(event: any, i: any) { + i.setValue(event); + if (event >= 99999) { + this.modalService.warning({ + nzTitle: '可输入的最大金额为99999元' + }); + } + this.payChange(); + } + + checkGoodsName() { + const name = this.sf3.getValue('/goodsName1'); + if (!name || name.trim().length === 0) { + return; + } + this.service.request(this.service.$api_checkGoodsName, name).subscribe(res => { + if (res === false) { + const modalRef = this.modalService.error({ + nzTitle: '货物名称含有违禁词，请重新输入！', + }); + modalRef.afterClose.subscribe(result => { + // this.sf3.setValue('/goodsName1', null); + }); } + }); + } } diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index 30da689b..4909c270 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -94,7 +94,7 @@ 货物信息 - {{ item.goodsName }} + {{ item.goodsTypeName }} - {{ item.goodsName }} {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 @@ -190,7 +190,7 @@ （运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }}） -
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
+
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
@@ -220,6 +220,11 @@ [page]="{}" [req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }" [res]="{ reName: { list: 'data.records', total: 'data.total' } }"> + +
+ {{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }} +
+
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts index 4edb9f14..c2af6ae7 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.ts @@ -23,7 +23,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { } logColumns: STColumn[] = [ { title: '内容', index: 'operationContent' }, - { title: '操作人', index: 'operator' }, + { title: '操作人', render: 'operator' }, { title: '操作时间', index: 'operatorTimestamp' }, ]; totalObj: any; diff --git a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts index e24a5a29..37730ca3 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -172,6 +172,8 @@ export class SupplyManagementVehicleComponent implements OnInit { type: 'default', onClick: () => { tipsModal.destroy(); + this.st?.reload(); + this.getGoodsSourceStatistical(); } }, { @@ -182,10 +184,14 @@ export class SupplyManagementVehicleComponent implements OnInit { if(!result?.failNumber) { this.service.msgSrv.error('没有失败数据！'); tipsModal.destroy(); + this.st?.reload(); + this.getGoodsSourceStatistical(); return; } this.service.downloadFile(this.service.$api_getFailUploadGoodsOperateResource, result.ids) tipsModal.destroy(); + this.st?.reload(); + this.getGoodsSourceStatistical(); } }, ] @@ -194,51 +200,6 @@ export class SupplyManagementVehicleComponent implements OnInit { }); } - /** - * 修改运费 - */ - updateFreight(item: any) { - const modalRef = this.modal.create({ - nzTitle: '货源导入', - nzWidth: 600, - nzContent: SupplyManagementImportSupplyComponent, - nzComponentParams: { - // i: item - }, - nzFooter: null - }); - modalRef.afterClose.subscribe(result => { - if (result) { - const tipsModal = this.modal.create({ - nzTitle: '上传提示', - nzWidth: 600, - nzContent: `
文件上传完成！成功${result?.successNumber}条，失败${result?.failNumber}条！
`, - nzFooter: [ - { - label: '取 消', - type: 'default', - onClick: () => { - tipsModal.destroy(); - } - }, - { - label: '下载失败数据', - type: 'primary', - onClick: () => { - this.service.downloadFile(this.service.$api_getFailUploadGoodsOperateResource, result.ids); - // this.service.request(this.service.$api_getFailUploadGoodsOperateResource, result.ids).subscribe((res: any) => { - // if (res) { - // console.log(res); - // } - // }); - console.log(111); - } - } - ] - }); - } - }); - } /** * 重新指派 diff --git a/src/app/routes/supply-management/model/import-supply/import-supply.component.html b/src/app/routes/supply-management/model/import-supply/import-supply.component.html index fd35818d..f06873b6 100644 --- a/src/app/routes/supply-management/model/import-supply/import-supply.component.html +++ b/src/app/routes/supply-management/model/import-supply/import-supply.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 10:35:44 + * @LastEditTime : 2022-04-13 10:41:09 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -51,5 +51,5 @@
- +
diff --git a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts index 3f3a4613..e75aafe1 100644 --- a/src/app/routes/supply-management/model/import-supply/import-supply.component.ts +++ b/src/app/routes/supply-management/model/import-supply/import-supply.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-03-01 15:13:03 * @LastEditors : Shiming - * @LastEditTime : 2022-03-11 10:33:44 + * @LastEditTime : 2022-04-13 10:41:08 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\model\\import-supply\\import-supply.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -31,6 +31,7 @@ export class SupplyManagementImportSupplyComponent implements OnInit { status: boolean = true files2: any; schema: SFSchema = {}; + load = false ui: SFUISchema = {}; networkTransporter: any; // 网络货运人id uploadUrl = apiConf.file_upload_url; @@ -154,12 +155,11 @@ export class SupplyManagementImportSupplyComponent implements OnInit { }); } save(): void { - console.log(this?.networkTransporter) - console.log(this.sf.value) if(!this.sf.value?.shipperAppUserId || !this?.networkTransporter || !this.sf.value?.enterpriseProjectId || !this.sf.value?.fileName) { this.service.msgSrv.error('请填写必填项并上传文件！') return } + this.load =true; const formData : any= new FormData(); this.files?.forEach((file: any) => { formData.append('file', file); @@ -172,6 +172,7 @@ export class SupplyManagementImportSupplyComponent implements OnInit { this.service.request(this.service.$api_goodsResourceOperateImport, formData).subscribe(res => { if (res) { this.service.msgSrv.success('导入成功'); + this.load =false; this.modal.destroy({ ...res }); } }); diff --git a/src/app/routes/supply-management/services/supply-management.service.ts b/src/app/routes/supply-management/services/supply-management.service.ts index 10cbc648..f2680cc9 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -180,6 +180,9 @@ export class SupplyManagementService extends BaseService { // 发送邀请司机短信 $api_send_msg_code = `/api/mdc/pbc/smsSend/sendInviteDriver`; + // 校验货物名称是否合规 + $api_checkGoodsName = '/api/sdc/goodsResourceShipper/checkGoodsName'; + getDictByKey(dictKey: string) { const params = { dictKey: dictKey }; return this.request(this.$api_getDictValue, params); diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.html b/src/app/routes/sys-setting/components/staff-management/staff-management.component.html index 73157624..3c1580bf 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.html +++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.html @@ -8,7 +8,8 @@ [button]="'none'">
- +
@@ -18,8 +19,9 @@
- - + +
@@ -33,6 +35,6 @@
+ [req]="{ params: {nameOrPhone: this.sf.value?.nameOrPhone} }" [loading]="false" [scroll]="{ y: '370px' }" + (change)="stChange($event)"> \ No newline at end of file diff --git a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts index bcf5ed41..f29c7b7d 100644 --- a/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts +++ b/src/app/routes/sys-setting/components/staff-management/staff-management.component.ts @@ -32,7 +32,7 @@ export class StaffManagementComponent implements OnInit { { title: '', index: 'key', className: 'text-center', type: 'checkbox' }, { title: '员工姓名', className: 'text-center', index: 'name' }, { title: '手机号码', className: 'text-center', index: 'telephone' }, - { title: '角色',className: 'text-center', index: 'roleName' }, + { title: '角色', className: 'text-center', index: 'roleName' }, { title: '最后登录时间', index: 'lastLoginDate', @@ -67,7 +67,8 @@ export class StaffManagementComponent implements OnInit { }, { text: '冻结', - iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone, + iif: item => + item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone, click: item => this.action(item, 1), acl: { ability: ['SYSTEM-STAFF-lock'] } }, @@ -79,7 +80,8 @@ export class StaffManagementComponent implements OnInit { }, { text: '删除', - iif: item => item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone, + iif: item => + item.stateLocked === 0 && item.roleCode.split(',').indexOf('Administrator') === -1 && item.telephone !== this.user.phone, click: item => this.action(item, 3), acl: { ability: ['SYSTEM-STAFF-delete'] } } @@ -167,6 +169,11 @@ export class StaffManagementComponent implements OnInit { this.sf.reset(); } + exportList() { + const params = { nameOrPhone: this.sf.value?.nameOrPhone }; + this.service.downloadFile(this.service.$api_export_staff, { ...params, pageSize: -1 }); + } + private deleteStaff(params: any) { this.service.request(this.service.$api_delete_staff, params).subscribe(res => { if (res) { diff --git a/src/app/routes/sys-setting/services/system.service.ts b/src/app/routes/sys-setting/services/system.service.ts index 0a698775..208ea905 100644 --- a/src/app/routes/sys-setting/services/system.service.ts +++ b/src/app/routes/sys-setting/services/system.service.ts @@ -15,6 +15,8 @@ import { BaseService } from 'src/app/shared/services'; export class SystemService extends BaseService { // 分页查询企业项目员工列表 $api_get_enterprise_staff_page = '/api/mdc/cuc/userApp/getEnterpriseProjectStaffListPage'; + // 分页查询企业项目员工列表 + $api_export_staff = '/api/mdc/cuc/userApp/enterpriseProjectStaffExport'; // 添加员工 $api_add_staff = '/api/mdc/cuc/userApp/addStaff'; // 编辑员工 diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.html b/src/app/routes/tax-management/components/individual-income/individual-income.component.html index dedb0881..56db2766 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.html +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.html @@ -36,7 +36,7 @@ + [req]="{ process: beforeReq }" [page]="{}" [loading]="service.http.loading" (change)="stChange($event)"> diff --git a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts index c55b07de..15583442 100644 --- a/src/app/routes/tax-management/components/individual-income/individual-income.component.ts +++ b/src/app/routes/tax-management/components/individual-income/individual-income.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; -import { STChange, STColumn, STComponent, STData } from '@delon/abc/st'; +import { STChange, STColumn, STComponent, STData, STRequestOptions } from '@delon/abc/st'; import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ShipperBaseService } from '@shared'; import { NzModalService } from 'ng-zorro-antd/modal'; @@ -32,16 +32,15 @@ export class TaxManagementIndividualIncomeComponent implements OnInit { constructor(public service: TaxManagementService) {} - /** - * 查询参数 - */ - get reqParams() { - const params = Object.assign({}, this.sf?.value || {}, { - declareStatus: this.selectedIndex - }); - delete params._$expand; - return { ...params }; - } + beforeReq = (requestOptions: STRequestOptions) => { + Object.assign(requestOptions.body, { declareStatus: this.selectedIndex }); + if (this.sf) { + Object.assign(requestOptions.body, { ...this.sf.value }); + delete requestOptions.body._$expand; + } + this.selectedRows = []; + return requestOptions; + }; stChange(e: STChange): void { switch (e.type) { diff --git a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts index e11afb2a..424f8f6f 100644 --- a/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/order-reporting.component.ts @@ -119,7 +119,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { searchLoadingText: '搜索中...', allowClear: true, onSearch: (q: any) => { - let str =q.replace(/^\s+|\s+$/g,""); + let str = q.replace(/^\s+|\s+$/g, ""); if (str) { return this.service .request(this.service.$api_enterpriceList, { enterpriseName: str }) @@ -129,7 +129,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { return of([]); } }, - + } as SFSelectWidgetSchema }, driverName: { @@ -261,8 +261,8 @@ export class TaxManagementOrderReportingComponent implements OnInit { { title: '卸货地详细地址', index: 'unloadDetailedAddress', className: 'text-center', width: '180px' }, { title: '货主名称', index: 'shipperName', className: 'text-center', width: '180px' }, { title: '货主纳税人识别号', index: 'shipperProvinceCode', className: 'text-center', width: '180px' }, - { title: '录单时间', index: 'billCreateTime', className: 'text-center', width: '250px' }, - { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, + { title: '录单时间', index: 'recordTime', className: 'text-center', width: '250px' }, + { title: '接单时间', index: 'wayBillCreateTime', className: 'text-center', width: '200px' }, { title: '发车时间', index: 'loadTime', className: 'text-center', width: '200px' }, { title: '到车时间', index: 'unloadTime', className: 'text-center', width: '150px' }, { title: '结束时间', index: 'payeeName', className: 'text-center', width: '150px' }, @@ -308,7 +308,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { nzOkText: '确定', nzCancelText: '取消', nzOnOk: () => { - this.service.request(this.service.$api_get_recessionTaxOrder,params).subscribe((res: any) => { + this.service.request(this.service.$api_get_recessionTaxOrder, params).subscribe((res: any) => { if (res) { this.service.msgSrv.success('撤销成功'); this.search(); @@ -371,7 +371,7 @@ export class TaxManagementOrderReportingComponent implements OnInit { selectChange(item: any) { console.log(item); - + this.selectedIndex = item?.value || ''; setTimeout(() => { this.st.load(); @@ -499,5 +499,4 @@ export class TaxManagementOrderReportingComponent implements OnInit { }) } - } diff --git a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts index ee390253..9bb45bcc 100644 --- a/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts +++ b/src/app/routes/tax-management/components/order-reporting/verify-result/verify-result.component.ts @@ -51,7 +51,7 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit { beforeReq = (requestOptions: STRequestOptions) => {let a: string = ''; switch (this.subjectType) { case '0': - a = this.record?.networkTransporter; + a = this.record?.networkTransporterId; break case '1': a = this.record?.shipperId; @@ -60,7 +60,7 @@ export class TaxManagementOrderVerifyResultComponent implements OnInit { a = this.record?.driverId; break case '3': - a = this.record?.billId; + a = this.record?.wayBillId; break } Object.assign(requestOptions.body, { diff --git a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts index 0429894f..39e8bd93 100644 --- a/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts +++ b/src/app/routes/ticket-management/components/cancellation-invoice/cancellation-invoice.component.ts @@ -256,7 +256,7 @@ export class CancellationInvoiceComponent implements OnInit { hidden: true } }, - vatappHId: { + vatappHCode: { type: 'string', title: '申请编号', ui: { @@ -330,18 +330,18 @@ export class CancellationInvoiceComponent implements OnInit { private initST(): STColumn[] { return [ { title: '', index: 'key', type: 'checkbox', fixed: 'left', width: 50, className: 'text-center' }, - { title: '分票编号', render: 'vatinvcode', width: 200 }, + { title: '分票编号', render: 'vatinvcode', width: 220 }, { title: '申请编号', index: 'vatappHCode', - width: 150, + width: 220, type: 'link', click: item => this.router.navigate(['/ticket/invoice-requested/detail/' + item?.vatappHId]) }, { title: '申请时间', index: 'createTime', type: 'date', width: 150 }, { title: '发票类型', index: 'vatapptypeLabel', width: 150 }, - { title: '网络货运人', index: 'ltdName', width: 160 }, - { title: '购买人', index: 'artoname', width: 160 }, + { title: '网络货运人', index: 'ltdName', width: 220 }, + { title: '购买人', index: 'artoname', width: 220 }, { title: '订单数', index: 'ordlines', width: 90, className: 'text-right' }, { title: '价税合计', @@ -376,7 +376,7 @@ export class CancellationInvoiceComponent implements OnInit { }, { title: '服务名称', index: 'vatname', width: 120 }, { title: '销货清单', index: 'isdetail', width: 120, type: 'enum', enum: { 1: '是', 0: '否' }, className: 'text-center' }, - { title: '票面备注', index: 'remarks', width: 250 }, + { title: '票面备注', index: 'remarks', width: 300 }, { title: '其他要求', index: 'otherremarks', width: 100 }, { title: '操作', diff --git a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts index a899ade5..381bb9db 100644 --- a/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts +++ b/src/app/routes/ticket-management/components/etc-blacklist/etc-blacklist.component.ts @@ -237,7 +237,7 @@ export class ETCBlacklistComponent implements OnInit { } }, params5: { - title: '司机姓名', + title: '车辆所有人', type: 'string', ui: { placeholder: '请输入', diff --git a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html index 408d94d9..9f09fdbf 100644 --- a/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html +++ b/src/app/routes/ticket-management/components/invoice-detail/invoice-detail.component.html @@ -8,7 +8,7 @@
-
+
{{ headerInfo?.ltdName }} @@ -34,7 +34,7 @@ {{ headerInfo?.remarks }}
-
+
{{ headerInfo?.artoname }} @@ -57,7 +57,7 @@ {{headerInfo?.otherremarks || '-'}}
-
+
@@ -118,7 +118,7 @@ (ngModelChange)="invoiceST.setRow(index, { vatname: $event })" style="width: 100%"> - {{ item.vatname }} + {{ item.vatnameLabel || item.vatname }}
-
- +
+ + {{headerInfo?.ltdidName}} - - {{headerInfo?.vatappcode}} - + {{headerInfo?.vatinvHNum}} / {{headerInfo?.vatinvBillNum}} @@ -31,13 +30,16 @@ {{headerInfo?.provinceName}}{{headerInfo?.cityName}}{{headerInfo?.areaName}}{{headerInfo?.reciaddr}}
-
+
{{headerInfo?.artoName}} {{headerInfo?.taxNumber}} + + {{headerInfo?.vatappcode}} + {{headerInfo?.registerAddr}} diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts index 401e2a10..7700b77c 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested-detail/invoice-requested-detail.component.ts @@ -177,7 +177,7 @@ export class InvoiceRequestedDetailComponent implements OnInit { } routeToOrder(item: any) { - if (item.billType === 1) { + if (item.billType === '1') { this.router.navigate(['/order-management/vehicle/vehicle-detail/' + item.billHId]); } else { this.router.navigate(['/order-management/bulk/bulk-detail/' + item.billHId]); diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html index 1f5cb96d..8b2f989e 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.html @@ -20,7 +20,7 @@
- +
- + \ No newline at end of file diff --git a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts index c58695a6..14a3554c 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts +++ b/src/app/routes/ticket-management/components/invoice-requested/invoice-requested.component.ts @@ -212,7 +212,7 @@ export class InvoiceRequestedComponent { label: '手工处理', onClick: () => { const params = { - ficoVatappBillVOList: this.selectedRows.map(item => { + ficoVatappHVOList: this.selectedRows.map(item => { const i = Object.assign({}, { ...item }); delete i._values; delete i._rowClassName; @@ -236,7 +236,7 @@ export class InvoiceRequestedComponent { label: '自动开票', onClick: () => { const params = { - ficoVatappBillVOList: this.selectedRows.map(item => { + ficoVatappHVOList: this.selectedRows.map(item => { const i = Object.assign({}, { ...item }); delete i._values; delete i._rowClassName; @@ -302,6 +302,11 @@ export class InvoiceRequestedComponent { this.sf?.setValue('/expand', this._$expand); } + // 导出 + exprot() { + this.service.exportStart({ ...this.sf.value, pageSize: -1 }, this.service.$api_export_invoice_requested_page); + } + private initSF(): SFSchema { return { properties: { diff --git a/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.html b/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.html index 119c6269..592208d6 100644 --- a/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.html +++ b/src/app/routes/ticket-management/components/invoice-requested/print-order-modal/print-order-modal.component.html @@ -11,7 +11,7 @@ - + {{item.contact}}      {{item.tel}}
@@ -25,7 +25,7 @@ - + {{item.contact}}      {{item.tel}}
diff --git a/src/app/routes/ticket-management/services/ticket.service.ts b/src/app/routes/ticket-management/services/ticket.service.ts index a095e26e..df5dd9d9 100644 --- a/src/app/routes/ticket-management/services/ticket.service.ts +++ b/src/app/routes/ticket-management/services/ticket.service.ts @@ -17,6 +17,8 @@ export class TicketService extends ShipperBaseService { // 运营端查询发票申请记录 $api_get_invoice_requested_page = '/api/fcc/ficoVatappH/queryOperateVatappHList'; + // 导出发票申请记录 + $api_export_invoice_requested_page = '/api/fcc/ficoVatappH/reportOperateVatappHList'; // 获取开票申请订单明细头部信息 $api_get_invoice_requested_header_detail = '/api/fcc/ficoVatappBill/getDetailHeadByVatappHId'; // 货主/运营端获取开票申请订单明细 @@ -74,7 +76,7 @@ export class TicketService extends ShipperBaseService { // 获取分票发票抬头开票申请订单明细 $api_get_invoice_order_detail = '/api/fcc/ficoVatappBill/getDetailByVatinvHId'; // 货主/运营端获取开票申请订单明细导出 - $api_export_invoice_order_detail = '/api/fcc/ficoVatappBill/reportDetailByVatapp'; + $api_export_invoice_order_detail = '/api/fcc/ficoVatappBill/reportDetailByVatinvHId'; // 获取分票发票抬头开票申请费用明细 $api_get_invoice_cost_detail = '/api/fcc/ficoVatappFee/getDetailByVatinvHId'; // 获取分票发票明细 @@ -149,21 +151,22 @@ export class TicketService extends ShipperBaseService { if (!url) { return; } - const uA = window.navigator.userAgent; // 判断浏览器内核 - const isIE = - /msie\s|trident\/|edge\//i.test(uA) && - !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window); - const objectUrl = url; - const a = document.createElement('a'); - document.body.appendChild(a); - a.href = objectUrl; - a.download = '面单.pdf'; - if (isIE) { - // 兼容IE11无法触发下载的问题 - (navigator as any).msSaveBlob(url, a.download); - } else { - a.click(); - } - a.remove(); + this.openURL(url); + // const uA = window.navigator.userAgent; // 判断浏览器内核 + // const isIE = + // /msie\s|trident\/|edge\//i.test(uA) && + // !!('uniqueID' in document || 'documentMode' in document || 'ActiveXObject' in window || 'MSInputMethodContext' in window); + // const objectUrl = url; + // const a = document.createElement('a'); + // document.body.appendChild(a); + // a.href = objectUrl; + // a.download = '面单.pdf'; + // if (isIE) { + // // 兼容IE11无法触发下载的问题 + // (navigator as any).msSaveBlob(url, a.download); + // } else { + // a.click(); + // } + // a.remove(); } } diff --git a/src/app/routes/usercenter/components/driver/driver.component.ts b/src/app/routes/usercenter/components/driver/driver.component.ts index e2e85027..b4956e3c 100644 --- a/src/app/routes/usercenter/components/driver/driver.component.ts +++ b/src/app/routes/usercenter/components/driver/driver.component.ts @@ -17,7 +17,7 @@ export class UserCenterComponentsDriverComponent implements OnInit { _$expand = false; @ViewChild('st', { static: false }) st!: STComponent; @ViewChild('sf', { static: false }) sf!: SFComponent; - ui: SFUISchema = { '*': { spanLabelFixed: 120, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } }; + ui: SFUISchema = { '*': { spanLabelFixed: 130, grid: { lg: 8, md: 12, sm: 12, xs: 24 }, enter: () => this.st.load() } }; schema: SFSchema = this.initSF(); columns: STColumn[] = this.initST(); @@ -199,10 +199,10 @@ export class UserCenterComponentsDriverComponent implements OnInit { title: '从业资格证状态', enum: [ { label: '全部', value: '' }, - { label: '待审核', value: 10 }, - { label: '审核通过', value: 20 }, - { label: '驳回', value: 30 }, - { label: '证件过期', value: 40 } + { label: '未提交 ', value: -1 }, + { label: '已提交', value: 1 }, + { label: '已通过', value: 2 }, + { label: '已过期', value: 3 } ], default: '', ui: { @@ -302,10 +302,13 @@ export class UserCenterComponentsDriverComponent implements OnInit { type: 'badge', badge: { '-1': { text: '未提交', color: 'default' }, - 10: { text: '待审核', color: 'default' }, - 20: { text: '审核通过', color: 'success' }, - 30: { text: '驳回', color: 'warning' }, - 40: { text: '证件过期', color: 'error' } + 1: { text: '已提交', color: 'processing' }, + 2: { text: '已通过', color: 'success' }, + 3: { text: '已过期', color: 'error' }, + // 10: { text: '待审核', color: 'default' }, + // 20: { text: '审核通过', color: 'success' }, + // 30: { text: '驳回', color: 'warning' }, + // 40: { text: '证件过期', color: 'error' } }, width: 180 }, diff --git a/src/app/routes/vehicle/components/audit/audit.component.ts b/src/app/routes/vehicle/components/audit/audit.component.ts index 91b2323f..95ad7e8b 100644 --- a/src/app/routes/vehicle/components/audit/audit.component.ts +++ b/src/app/routes/vehicle/components/audit/audit.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, ViewChild } from '@angular/core'; import { ActivatedRoute, Router } from '@angular/router'; import { STColumn, STColumnBadge, STComponent, STData } from '@delon/abc/st'; -import { SFComponent, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; +import { SFComponent, SFDateWidgetSchema, SFSchema, SFSchemaEnum, SFSelectWidgetSchema, SFUISchema } from '@delon/form'; import { ModalHelper } from '@delon/theme'; import { NzModalService } from 'ng-zorro-antd/modal'; import { of, Subject } from 'rxjs'; @@ -135,7 +135,7 @@ export class VehicleComponentsAuditComponent implements OnInit { expand: (value: boolean) => value } } - } + }, // approvalStatus: { // type: 'string', // title: '审核状态', @@ -155,9 +155,22 @@ export class VehicleComponentsAuditComponent implements OnInit { // }, // }, // }, + // approvalPassTime: { + // type: 'string', + // title: '审核通过时间', + // ui: { + // widget: 'sl-from-to-search', + // format: 'yyyy-MM-dd', + // placeholder: '请选择', + // nzShowTime: true, + // visibleIf: { + // expand: (value: boolean) => value + // } + // } as SFDateWidgetSchema + // } } }; - this.ui = { '*': { spanLabelFixed: 90, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; + this.ui = { '*': { spanLabelFixed: 120, grid: { span: 8, gutter: 4 }, enter: () => this.st.load() } }; } initST() { @@ -186,6 +199,7 @@ export class VehicleComponentsAuditComponent implements OnInit { } }, { title: '申请时间', width: '180px', className: 'text-center', index: 'createTime' }, + { title: '审核通过时间', width: '180px', className: 'text-center', index: 'approvalPassTime' }, { title: '操作', fixed: 'right', diff --git a/src/app/routes/vehicle/components/list/list.component.ts b/src/app/routes/vehicle/components/list/list.component.ts index ef828516..5a871858 100644 --- a/src/app/routes/vehicle/components/list/list.component.ts +++ b/src/app/routes/vehicle/components/list/list.component.ts @@ -184,22 +184,22 @@ export class VehicleComponentsListComponent implements OnInit { } } }, - isSelfs: { - type: 'string', - title: '是否入网', - enum: [ - { label: '全部', value: '' }, - { label: '是', value: 1 }, - { label: '否', value: 0 } - ], - ui: { - widget: 'select', - allowClear: true, - visibleIf: { - expand: (value: boolean) => value - } - } - } + // isSelfs: { + // type: 'string', + // title: '是否入网', + // enum: [ + // { label: '全部', value: '' }, + // { label: '是', value: 1 }, + // { label: '否', value: 0 } + // ], + // ui: { + // widget: 'select', + // allowClear: true, + // visibleIf: { + // expand: (value: boolean) => value + // } + // } + // } // putOnRecord: { // type: 'string', // title: '是否已备案', @@ -263,7 +263,7 @@ export class VehicleComponentsListComponent implements OnInit { 3: { text: '已到期', color: 'error' } } }, - { title: '是否入网', width: '200px', className: 'text-center', index: 'carOwner' }, + // { title: '是否入网', width: '200px', className: 'text-center', index: 'carOwner' }, { title: '所有人', width: '200px', className: 'text-center', index: 'carOwner' }, { title: '是否挂靠', width: '150px', className: 'text-center', render: 'isSelf' }, { title: '挂靠协议', width: '150px', className: 'text-center', render: 'approvalAuditStatus' }, 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 375f357c..37877333 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 @@ -39,8 +39,8 @@ export class WaybillManagementBulkeDetailComponent implements OnInit { modalTitle:string = ''; unLoadingPlaceVOList: any = []; logColumns2: STColumn[] = [ - { title: '时间', index: 'vinOutTime' }, - { title: '地点', index: 'cityName' }, + { title: '时间', index: 'parkBte' }, + { title: '地点', index: 'parkAdr' }, ]; logColumns: STColumn[] = [ { title: '款项', index: 'costCodeLabel' }, @@ -167,14 +167,15 @@ sureArrive(item: 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))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; - this.addressItems = res.cityArray; + this.addressItems = res.parkArray; if(this.addressItems && this.addressItems.length > 0){ this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.vinOutTime); + item.parkBte = this.getLocalTime(item.parkBte); }); } } @@ -190,7 +191,8 @@ sureArrive(item: 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))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; 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 626eadc9..1b96e1f4 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 @@ -160,14 +160,15 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro points?.forEach((item: any) => { list.push({ name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; - this.addressItems = res.cityArray; + this.addressItems = res.parkArray; if (this.addressItems && this.addressItems.length > 0) { this.addressItems.forEach(item => { - item.vinOutTime = this.getLocalTime(item.vinOutTime); + item.parkBte = this.getLocalTime(item.parkBte); }); } } @@ -183,7 +184,8 @@ export class WaybillManagementVehicleDetailComponent implements OnInit, OnDestro points?.forEach((item: any) => { list.push({ name: item.hgt, - lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))] + lnglat: [Number((Number(item.lon) / 600000).toFixed(6)), Number((Number(item.lat) / 600000).toFixed(6))], + time: item.gtm }); }); this.mapList = list; diff --git a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts index 1c810c67..f1b990ac 100644 --- a/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts +++ b/src/app/shared/components/amap/amap-path-simplifier/amap-path-simplifier.component.ts @@ -48,15 +48,18 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy @Output() readonly clcikPointEvent = new EventEmitter(); - constructor(public service: BaseService, private amapService: AmapService) {} + constructor(public service: BaseService, private amapService: AmapService) { + this.mapInit(); + } ngOnChanges(changes: SimpleChanges): void { // 路线图变更: 设置路线图, 指定路线图 if (changes?.pathList?.currentValue && this?.pathSimplifierIns) { this.setData(changes.pathList?.currentValue); this.setPathIndex(this.selectedIndex); } + // 路径信息变更: 更新路线图, 设置路线图, 指定路线图, 获取终点地址信息并标点 - if (changes?.mapList?.currentValue && this?.pathSimplifierIns && changes.mapList?.currentValue.length > 0) { + if (changes?.mapList?.currentValue) { // console.log(this.mapList); this.pathList = [ { @@ -64,22 +67,29 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy points: changes.mapList?.currentValue } ]; - this.setData(this.pathList); - this.setPathIndex(this.selectedIndex); - this.getPoiByPositon(this.mapList[this.mapList?.length - 1]?.lnglat); + if (this?.pathSimplifierIns) { + this.setData(this.pathList); + if (changes.mapList?.currentValue.length > 0) { + this.setPathIndex(this.selectedIndex); + this.getPoiByPositon('起', 'blue', this.mapList[0]?.lnglat, '时间：' + this.amapService.formatTime(this.mapList[0]?.time)); + this.getPoiByPositon( + '终', + 'red', + this.mapList[this.mapList?.length - 1]?.lnglat, + '时间：' + this.amapService.formatTime(this.mapList[this.mapList?.length - 1]?.time) + ); + } + } } // 标点列表变更: 更新标点数据, 绘画标点 if (changes?.pois?.currentValue) { - // console.log(this.pois); this._pois = changes?.pois?.currentValue; if (this?.markerList && this._pois.length > 0) { this.markerList.render(this._pois); } } } - ngOnInit(): void { - this.mapInit(); - } + ngOnInit(): void {} ngOnDestroy(): void { // 销毁地图数据 if (this.aMap) { @@ -143,8 +153,15 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy }); this.setData(this.pathList); - if (this.pathList.length > 0) { + if (this.mapList.length > 0) { this.setPathIndex(this.selectedIndex); + this.getPoiByPositon('起', 'blue', this.mapList[0]?.lnglat, '时间：' + this.amapService.formatTime(this.mapList[0]?.time)); + this.getPoiByPositon( + '终', + 'red', + this.mapList[this.mapList?.length - 1]?.lnglat, + '时间：' + this.amapService.formatTime(this.mapList[this.mapList?.length - 1]?.time) + ); } this.pathSimplifierIns.on('pointClick', (e: any, info: any) => { @@ -158,7 +175,10 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges, OnDestroy position: info.pathData.points[info.pointIndex].lnglat, content: `