', + text: '查看
', acl: { ability: ['USERCENTER-FREIGHT-LIST-view'] }, click: item => { this.router.navigate(['./detail', item.id], { relativeTo: this.ar }); diff --git a/src/app/routes/waybill-management/components/bulk/bulk.component.ts b/src/app/routes/waybill-management/components/bulk/bulk.component.ts index cb32070e..858b314b 100644 --- a/src/app/routes/waybill-management/components/bulk/bulk.component.ts +++ b/src/app/routes/waybill-management/components/bulk/bulk.component.ts @@ -273,16 +273,21 @@ tabs = { }, { title: '接单数量', + render: 'receveOrderCountInfo', + width: '170px', className: 'text-left', - width: '200px', - index: 'orderReceivingQuantity' - + format: (item: any) => + `${item.acceptWeight || '--'}吨/ + ${item.acceptVolume || '--'}方` }, { - title: '结算重量', + title: '结算数量', + index: '结算数量', + width: '170px', className: 'text-left', - width: '200px', - index: 'settlementWeight' + format: (item: any) => + `${item.settlementWeight || '--'}吨/ + ${item.settlementVolume || '--'}方` }, { title: '承运司机', diff --git a/src/app/shared/components/account-detail/account-detail.component.ts b/src/app/shared/components/account-detail/account-detail.component.ts index d0f6cd33..e81ea5fe 100644 --- a/src/app/shared/components/account-detail/account-detail.component.ts +++ b/src/app/shared/components/account-detail/account-detail.component.ts @@ -29,7 +29,7 @@ export class AccountDetailComponent implements OnInit { } const params = { ltdId: item.ltdId || this.params.ltdId, - roleId: item.roleId|| this.params.roleId, + roleId: item.roleId || this.params.roleId, projectId: item.projectId || this.params.projectId, enterpriseId: item.enterpriseId || this.params.roleId, ctfId: this.params.ctfId, @@ -46,7 +46,7 @@ export class AccountDetailComponent implements OnInit { }) .subscribe(res => { if (res) { - this.service.msgSrv.success(res?.pfMsg); + this.service.msgSrv.success(type === '1' ? res?.paMsg : res?.pfMsg); this.modalHelp.destroy(); } }); @@ -60,7 +60,7 @@ export class AccountDetailComponent implements OnInit { }) .subscribe(res => { if (res) { - this.service.msgSrv.success(res?.paMsg); + this.service.msgSrv.success(type === '1' ? res?.paMsg : res?.pfMsg); this.modalHelp.destroy(); } }); 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 4454a09e..93e6688f 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 @@ -45,13 +45,11 @@ export class AmapPathSimplifierComponent implements OnInit, OnChanges { ]; this.setData(this.pathList); this.setPathIndex(this.selectedIndex); + console.log(this.MapList); } } ngOnInit(): void { this.mapInit(); - console.log(this.MapList); - - // this.DataInit(); } ngOnDestroy(): void { if (this.aMap) { diff --git a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html index 9a2f46c7..9bbf50bc 100644 --- a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html +++ b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.html @@ -11,7 +11,7 @@ - +
diff --git a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts
index 3dd17484..6e01638f 100644
--- a/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts
+++ b/src/app/shared/components/amap/amap-poi-picker/amap-poi-picker.component.ts
@@ -3,6 +3,7 @@ import { ChangeDetectorRef, Component, Input, OnInit, ViewChild } from '@angular
import { amapConf } from '@conf/amap.config';
import { NzModalRef } from 'ng-zorro-antd/modal';
import { throwError } from 'rxjs';
+import { Script } from 'vm';
import { AmapService } from '../amap.service';
declare var AMap: any;
declare var AMapUI: any;
@@ -73,7 +74,7 @@ export class AmapPoiPickerComponent implements OnInit {
});
// 地图
- this.aMap = new AMap.Map('container', {
+ this.aMap = new AMap.Map('modal-container', {
resizeEnable: true,
zoom: 16
});
diff --git a/src/app/shared/components/imagelist/imagelist.component.html b/src/app/shared/components/imagelist/imagelist.component.html
index b3bddafd..3936f667 100644
--- a/src/app/shared/components/imagelist/imagelist.component.html
+++ b/src/app/shared/components/imagelist/imagelist.component.html
@@ -1,3 +1,10 @@
- ![]()
+
+
+ ![]()
+
+
+
+
+
\ No newline at end of file
diff --git a/src/app/shared/components/imagelist/imagelist.less b/src/app/shared/components/imagelist/imagelist.less
index fe9a7a13..a9da2f31 100644
--- a/src/app/shared/components/imagelist/imagelist.less
+++ b/src/app/shared/components/imagelist/imagelist.less
@@ -1,9 +1,11 @@
.imgBox {
- width: 100%;
+ width : 100%;
overflow: hidden;
+ display : flex;
+
img {
- width: 100px;
- margin: 0 10px;
+ width : 100px;
+ margin : 0 10px;
vertical-align: middle;
}
-}
+}
\ No newline at end of file