-
已选择{{ selectedRows?.length || 0 }}条订单，确认批量签收吗？
+
已选择{{
+ selectedRows?.length || 0 }}条订单，确认批量签收吗？
签收后不可再修改运费，请确保运费等信息准确无误后，再进行签收。
-
+
\ No newline at end of file
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.less b/src/app/routes/order-management/components/vehicle/vehicle.component.less
index ee086ec9..e69de29b 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.less
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.less
@@ -1,5 +0,0 @@
-:host {
- p{
- margin-bottom: 0
- }
-}
\ No newline at end of file
diff --git a/src/app/routes/order-management/components/vehicle/vehicle.component.ts b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
index f4866cae..75d29b9a 100644
--- a/src/app/routes/order-management/components/vehicle/vehicle.component.ts
+++ b/src/app/routes/order-management/components/vehicle/vehicle.component.ts
@@ -4,8 +4,8 @@ import { STColumn, STComponent, 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';
-import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { fromEvent, of } from 'rxjs';
+import { debounceTime, map } from 'rxjs/operators';
import { OneCarOrderCancelConfirmComponent } from '../../modal/vehicle/cancel-confirm/cancel-confirm.component';
import { VehicleConfirReceiptComponent } from '../../modal/vehicle/confir-receipt/confir-receipt.component';
import { VehicleFreightPeopleComponent } from '../../modal/vehicle/freight-people/freight-people.component';
@@ -15,11 +15,10 @@ import { VehicleUpdateFreightComponent } from '../../modal/vehicle/update-freigh
import { OneCarOrderViewtrackComponent } from '../../modal/vehicle/view-track/view-track.component';
import { OrderManagementService } from '../../services/order-management.service';
-
@Component({
selector: 'app-supply-management-vehicle',
templateUrl: './vehicle.component.html',
- styleUrls: ['./vehicle.component.less']
+ styleUrls: ['../../../commom/less/commom-table.less']
})
export class OrderManagementVehicleComponent implements OnInit {
ui: SFUISchema = {};
@@ -29,9 +28,9 @@ export class OrderManagementVehicleComponent implements OnInit {
isVisibleEvaluate = false;
isVisible = false;
loading: boolean = true;
- changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
- changeViewId: any; // 查看运费变更记录id - 用于查看
- ViewCause: any; // 变更运费查看数据
+ changeId: any; // 主页面查看运费变更记录id - 用于运费变更记录
+ changeViewId: any; // 查看运费变更记录id - 用于查看
+ ViewCause: any; // 变更运费查看数据
shipList: any; // 货主评价 数据
diverList: any; // 司机评价 数据
_$expand = false;
@@ -45,39 +44,42 @@ export class OrderManagementVehicleComponent implements OnInit {
columnsFloatView: STColumn[] = [];
datass: any = [
{
- one: '1',
- two: '1',
- three: '1',
- id: 1
- },
+ one: '1',
+ two: '1',
+ three: '1',
+ id: 1
+ },
{
- one: '2',
- two: '2',
- three: '2',
- id: 2
- },
-];
-tabs = {
- cancelQuantity: 0,
- receivedQuantity: 0,
- stayQuantity: 0,
- signQuantity: 0,
- compolatelQuantity: 0,
- GoingQuantity: 0,
- totalCount: 0
-};
-resourceStatus: any;
+ one: '2',
+ two: '2',
+ three: '2',
+ id: 2
+ }
+ ];
+ tabs = {
+ cancelQuantity: 0,
+ receivedQuantity: 0,
+ stayQuantity: 0,
+ signQuantity: 0,
+ compolatelQuantity: 0,
+ GoingQuantity: 0,
+ totalCount: 0
+ };
+ resourceStatus: any;
+
+ scrollY = '400px';
+ visible = false;
constructor(
public service: OrderManagementService,
private modal: NzModalService,
public shipperservice: ShipperBaseService,
public router: Router,
- public ar: ActivatedRoute,
- ) { }
+ public ar: ActivatedRoute
+ ) {}
/**
- * 查询参数
- */
+ * 查询参数
+ */
get changeParams() {
return {
id: this.changeId
@@ -89,62 +91,91 @@ resourceStatus: any;
};
}
get reqParams() {
- const a:any = {};
- if(this.resourceStatus) {
+ const a: any = {};
+ if (this.resourceStatus) {
a.billStatus = this.resourceStatus;
- }
+ }
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
- return {
+ return {
...a,
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
- end: this.sf?.value?.createTime?.[1] || '',
- },
- };
+ end: this.sf?.value?.createTime?.[1] || ''
+ }
+ };
}
beforeReq = (requestOptions: STRequestOptions) => {
- const a:any = {};
- if(this.resourceStatus) {
+ const a: any = {};
+ if (this.resourceStatus) {
a.billStatus = this.resourceStatus;
- }
+ Object.assign(requestOptions.body, {
+ ...a
+ });
+ }
const params: any = Object.assign({}, this.sf?.value || {});
delete params._$expand;
if (this.sf) {
Object.assign(requestOptions.body, {
- ...a,
...params,
createTime: {
start: this.sf?.value?.createTime?.[0] || '',
- end: this.sf?.value?.createTime?.[1] || '',
- },
+ end: this.sf?.value?.createTime?.[1] || ''
+ }
});
}
this.loading = true;
return requestOptions;
};
afterRes = (data: any[], rawData?: any) => {
- console.log(data)
- this.loading = false
+ console.log(data);
+ this.loading = false;
return data.map(item => ({
...item,
- disabled: item.billStatus == '6'
+ disabled: item.billStatus == '6'
}));
};
get selectedRows() {
- return this.st?.list.filter((item) => item.checked) || [];
+ return this.st?.list.filter(item => item.checked) || [];
}
ngOnInit(): void {
- this.getGoodsSourceStatistical()
+ this.getGoodsSourceStatistical();
this.initSF();
this.initST();
this.initSTFloat();
this.initSTFloatView();
+
+ setTimeout(() => {
+ this.getScrollY();
+ }, 100);
+ fromEvent(window, 'resize')
+ .pipe(debounceTime(100))
+ .subscribe(event => {
+ this.getScrollY();
+ });
}
+
+ getScrollY() {
+ const windowHeight = window.innerHeight || Math.max(document.documentElement.clientHeight, document.body.clientHeight);
+ const header = document.getElementsByTagName('layout-pro-header')?.[0];
+ if (windowHeight && header) {
+ let scrollY = windowHeight - header.clientHeight - 35 - 49;
+ const headerWrapper = document.getElementsByTagName('page-header-wrapper')?.[0];
+ if (headerWrapper) {
+ scrollY -= headerWrapper.clientHeight;
+ }
+ const tabset = document.getElementsByTagName('nz-tabset')?.[0];
+ if (tabset) {
+ scrollY -= tabset.clientHeight;
+ }
+ this.scrollY = scrollY + 'px';
+ }
+ }
+
search() {
- this.st?.load(1);
- this.getGoodsSourceStatistical()
+ this.st?.load(1);
+ this.getGoodsSourceStatistical();
}
getGoodsSourceStatistical() {
this.tabs = {
@@ -157,35 +188,35 @@ resourceStatus: any;
totalCount: 0
};
const params: any = Object.assign({}, this.reqParams || {});
- delete params.billStatus
- this.service.request(this.service.$api_statisticalStatus,params).subscribe(res => {
+ delete params.billStatus;
+ this.service.request(this.service.$api_statisticalStatus, params).subscribe(res => {
if (res) {
let totalCount = 0;
- res.forEach((element: any) => {
- if(element.billStatusLabel === '待发车') {
- this.tabs.stayQuantity = element.quantity
- } else if (element.billStatusLabel === '待接单') {
- this.tabs.receivedQuantity = element.quantity
- } else if (element.billStatusLabel === '运输中') {
- this.tabs.GoingQuantity = element.quantity
- } else if (element.billStatusLabel === '待签收') {
- this.tabs.signQuantity = element.quantity
- } else if (element.billStatusLabel === '已完成') {
- this.tabs.compolatelQuantity = element.quantity
- } else if (element.billStatusLabel === '已取消') {
- this.tabs.cancelQuantity = element.quantity
- }
- totalCount += element.quantity
- });
- this.tabs.totalCount = totalCount
+ res.forEach((element: any) => {
+ if (element.billStatusLabel === '待发车') {
+ this.tabs.stayQuantity = element.quantity;
+ } else if (element.billStatusLabel === '待接单') {
+ this.tabs.receivedQuantity = element.quantity;
+ } else if (element.billStatusLabel === '运输中') {
+ this.tabs.GoingQuantity = element.quantity;
+ } else if (element.billStatusLabel === '待签收') {
+ this.tabs.signQuantity = element.quantity;
+ } else if (element.billStatusLabel === '已完成') {
+ this.tabs.compolatelQuantity = element.quantity;
+ } else if (element.billStatusLabel === '已取消') {
+ this.tabs.cancelQuantity = element.quantity;
+ }
+ totalCount += element.quantity;
+ });
+ this.tabs.totalCount = totalCount;
}
- })
+ });
}
/**
- * 初始化查询表单
- */
- initSF() {
+ * 初始化查询表单
+ */
+ initSF() {
this.schema = {
properties: {
_$expand: { type: 'boolean', ui: { hidden: true } },
@@ -193,8 +224,8 @@ resourceStatus: any;
type: 'string',
title: '订单号',
ui: {
- placeholder: '最多100个单号，空号隔开',
- }
+ placeholder: '最多100个单号，空号隔开'
+ }
},
resourceCode: {
type: 'string',
@@ -210,11 +241,11 @@ resourceStatus: any;
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})
- .pipe(map((res: any) => (res as any[]).map((i) => ({ label: i.enterpriseName, value: i.id } as SFSchemaEnum))))
+ .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([]);
@@ -223,76 +254,50 @@ resourceStatus: any;
change: (q: any) => {
this.getRegionCode(q);
}
- } as SFSelectWidgetSchema,
+ } as SFSelectWidgetSchema
},
enterpriseProjectId: {
type: 'string',
title: '所属项目',
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- _$expand: (value: boolean) => value
- },
+ placeholder: '请选择'
} as SFSelectWidgetSchema
},
loadingPlace: {
type: 'string',
title: '装货地',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ ui: {}
},
dischargePlace: {
type: 'string',
title: '卸货地',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ ui: {}
},
driverName: {
title: '承运司机',
type: 'string',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ ui: {}
},
carNo: {
title: '车牌号',
type: 'string',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value
- }
- }
+ ui: {}
},
carCaptainName: {
title: '车队长',
type: 'string',
- ui: {
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
- }
- },
+ ui: {}
+ },
paymentStatus: {
title: '支付状态',
type: 'string',
ui: {
widget: 'dict-select',
params: { dictKey: 'overall:payment:status' },
- containsAllLable: true,
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
- } as SFSelectWidgetSchema,
+ containsAllLable: true
+ } as SFSelectWidgetSchema
},
createTime: {
title: '创建时间',
@@ -300,10 +305,7 @@ resourceStatus: any;
ui: {
widget: 'date',
mode: 'range',
- format: 'yyyy-MM-dd',
- visibleIf: {
- _$expand: (value: boolean) => value
- }
+ format: 'yyyy-MM-dd'
} as SFDateWidgetSchema
},
riskStatus: {
@@ -316,11 +318,8 @@ resourceStatus: any;
],
ui: {
widget: 'select',
- placeholder: '请选择',
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
- },
+ placeholder: '请选择'
+ }
},
enterpriseInfoId: {
type: 'string',
@@ -328,12 +327,9 @@ resourceStatus: any;
ui: {
widget: 'select',
placeholder: '请选择',
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
allowClear: true,
- asyncData: () => this.shipperservice.getNetworkFreightForwarder(),
- },
+ asyncData: () => this.shipperservice.getNetworkFreightForwarder()
+ }
},
// goodsNameId: {
// type: 'string',
@@ -362,16 +358,13 @@ resourceStatus: any;
ui: {
widget: 'dict-select',
params: { dictKey: 'service:type' },
- containsAllLable: true,
- visibleIf: {
- _$expand: (value: boolean) => value,
- },
- } as SFSelectWidgetSchema,
- },
+ containsAllLable: true
+ } as SFSelectWidgetSchema
+ }
},
type: 'object'
};
- this.ui = { '*': { spanLabelFixed: 110, grid: { span: 8, gutter: 4 } } };
+ this.ui = { '*': { spanLabelFixed: 95, grid: { span: 24, gutter: 4 } } };
}
/**
@@ -379,7 +372,7 @@ resourceStatus: any;
*/
initST() {
this.columns = [
- { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
+ { title: '', type: 'checkbox', fixed: 'left', width: '50px', className: 'text-center' },
{
title: '订单号',
width: '200px',
@@ -391,7 +384,7 @@ resourceStatus: any;
title: '运费明细',
width: '250px',
className: 'text-right',
- render: 'mybidDetailInfo',
+ render: 'mybidDetailInfo'
},
{ title: '录单员', render: 'createUserName', width: '200px', className: 'text-left' },
{ title: '网络货运人', index: 'enterpriseInfoName', width: '250px', className: 'text-left' },
@@ -410,7 +403,8 @@ resourceStatus: any;
className: 'text-left',
width: '170px',
render: 'goodsName'
- }, {
+ },
+ {
title: '承运司机',
className: 'text-left',
width: '250px',
@@ -420,7 +414,7 @@ resourceStatus: any;
title: '收款人',
className: 'text-left',
render: 'payeeName',
- width: '180px',
+ width: '180px'
},
{
title: '装卸货时间',
@@ -432,7 +426,7 @@ resourceStatus: any;
title: '创建时间',
className: 'text-left',
index: 'createTime',
- width: '170px',
+ width: '170px'
},
{
title: '操作',
@@ -440,65 +434,68 @@ resourceStatus: any;
width: '130px',
className: 'text-center block-td',
buttons: [
-
{
text: '运费变更记录',
- click: (_record) => this.OpenPrice(_record),
- iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3' || item.billStatus == '6',
- acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] },
- },
- {
- text: '查看详情',
- click: (item: any) => {
- this.router.navigate(['./vehicle-detail', item.id], { relativeTo: this.ar });
- },
- acl: { ability: ['USERCENTER-FREIGHT-USER-view'] },
+ click: _record => this.OpenPrice(_record),
+ iif: item =>
+ item.billStatus == '4' ||
+ item.billStatus == '5' ||
+ item.billStatus == '2' ||
+ item.billStatus == '3' ||
+ item.billStatus == '6',
+ acl: { ability: ['ORDER-VEHICLE-ChangeApplyList'] }
},
+ // {
+ // text: '查看详情',
+ // click: (item: any) => {
+ // this.router.navigate(['./vehicle-detail', item.id], { relativeTo: this.ar });
+ // },
+ // acl: { ability: ['USERCENTER-FREIGHT-USER-view'] }
+ // },
{
text: '查看评价',
- click: (_record) => this.viewEvaluate(_record),
+ click: _record => this.viewEvaluate(_record),
iif: item => item.billStatus == '5',
- acl: { ability: ['ORDER-VEHICLE-evaluation'] },
+ acl: { ability: ['ORDER-VEHICLE-evaluation'] }
},
{
text: '变更运费',
- click: (_record) => this.updateFreight(_record),
+ click: _record => this.updateFreight(_record),
iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus != '2',
- acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] },
+ acl: { ability: ['ORDER-VEHICLE-FreightChangeWholeDetail'] }
},
{
text: '确认签收',
- click: (_record) => this.confirmReceipt(_record),
+ click: _record => this.confirmReceipt(_record),
iif: item => item.billStatus == '4',
- acl: { ability: ['ORDER-VEHICLE-signWholeOrder'] },
+ acl: { ability: ['ORDER-VEHICLE-signWholeOrder'] }
},
{
text: '取消订单',
- click: (_record) => this.cancellation(_record),
- iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus !== '2',
- acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] },
+ click: _record => this.cancellation(_record),
+ iif: item => item.billStatus !== '1' && item.billStatus !== '6' && item.overallPaymentStatus !== '2',
+ acl: { ability: ['ORDER-VEHICLE-cancelAnOrder'] }
},
{
text: '修改订单',
- click: (_record) => this.changeOrder(_record),
+ click: _record => this.changeOrder(_record),
iif: item => item.billStatus == '4' || item.billStatus == '5' || item.billStatus == '2' || item.billStatus == '3',
- acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
+ acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }
},
{
text: '申请退款',
- click: (_record) => this.applyRefund(_record),
+ click: _record => this.applyRefund(_record),
iif: item => item.isApplyForRefund,
- acl: { ability: ['ORDER-VEHICLE-modificationOrder'] },
+ acl: { ability: ['ORDER-VEHICLE-modificationOrder'] }
},
{
text: '查看轨迹',
- click: (_record) => this.viewTrack(_record),
- iif: item => item.billStatus !== '1' && item.billStatus !== '6',
+ click: _record => this.viewTrack(_record),
+ iif: item => item.billStatus !== '1' && item.billStatus !== '6'
// acl: { ability: ['VEHICLE-LIST-view'] },
- },
-
- ],
- },
+ }
+ ]
+ }
];
}
initSTFloat() {
@@ -518,7 +515,7 @@ resourceStatus: any;
className: 'text-center',
index: 'applyUserName'
},
- { title: '状态', index: 'handleStatusLabel', className: 'text-center' },
+ { title: '状态', index: 'handleStatusLabel', className: 'text-center' },
{
title: '操作',
fixed: 'right',
@@ -526,15 +523,15 @@ resourceStatus: any;
buttons: [
{
text: '查看',
- click: (_record) => this.FloatView(_record),
+ click: _record => this.FloatView(_record)
},
{
text: '撤销',
- click: (_record) => this.revoke(_record),
- iif: item => item.handleStatus === '1' || item.handleStatus === 1,
- },
- ],
- },
+ click: _record => this.revoke(_record),
+ iif: item => item.handleStatus === '1' || item.handleStatus === 1
+ }
+ ]
+ }
];
}
initSTFloatView() {
@@ -552,39 +549,31 @@ resourceStatus: any;
index: 'amountAfterChange',
render: 'amountAfterChange'
},
- { title: '变更值',
- index: 'amountchangeValue',
- render: 'amountchangeValue',
- width: '120px',
- className: 'text-center' },
- { title: '变更后',
- index: 'amountBeforeChange',
- render: 'amountBeforeChange',
- width: '120px',
- className: 'text-center' }
+ { title: '变更值', index: 'amountchangeValue', render: 'amountchangeValue', width: '120px', className: 'text-center' },
+ { title: '变更后', index: 'amountBeforeChange', render: 'amountBeforeChange', width: '120px', className: 'text-center' }
];
}
- // 获取城市列表
- getRegionCode(regionCode: any) {
- console.log(regionCode);
- return this.service
- .request(this.service.$api_get_enterprise_project, { id: regionCode })
- .pipe(
- map(res =>
- res.map((item: any) => ({
- label: item.projectName,
- value: item.id
- }))
+ // 获取城市列表
+ getRegionCode(regionCode: any) {
+ console.log(regionCode);
+ return this.service
+ .request(this.service.$api_get_enterprise_project, { id: regionCode })
+ .pipe(
+ map(res =>
+ res.map((item: any) => ({
+ label: item.projectName,
+ value: item.id
+ }))
+ )
)
- )
- .subscribe(res => {
- this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
- this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
- // if (this.enterpriseProjectIds) {
- // this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
- // }
- });
-}
+ .subscribe(res => {
+ this.sf.getProperty('/enterpriseProjectId')!.schema.enum = res;
+ this.sf.getProperty('/enterpriseProjectId')!.widget.reset(res);
+ // if (this.enterpriseProjectIds) {
+ // this.sf1.setValue('/enterpriseProjectId', this.enterpriseProjectIds);
+ // }
+ });
+ }
/**
* 查询字段个数
*/
@@ -592,14 +581,14 @@ resourceStatus: any;
return Object.keys(this.schema?.properties || {}).length;
}
/**
- * 伸缩查询条件
- */
+ * 伸缩查询条件
+ */
expandToggle(): void {
this._$expand = !this._$expand;
this.sf?.setValue('/_$expand', this._$expand);
}
tabChange(item: any) {
- console.log(item)
+ console.log(item);
}
/**
* 重置表单
@@ -618,85 +607,81 @@ resourceStatus: any;
/**
* 导入货源
*/
- importGoodsSource() {
+ importGoodsSource() {}
+ audit(item: any) {}
- }
- audit(item: any) {
- }
-
- /*
+ /*
* 审核关闭弹窗
view: 1
浮动费用： 0
查看评价： 3
*/
handleCancel(type: string) {
- console.log(type)
- if(type === '0') {
- this.isVisible = false
- } else if(type === '1') {
- this.isVisibleView = false
- } else if(type === '2') {
- this.isVisibleEvaluate = false
+ console.log(type);
+ if (type === '0') {
+ this.isVisible = false;
+ } else if (type === '1') {
+ this.isVisibleView = false;
+ } else if (type === '2') {
+ this.isVisibleEvaluate = false;
}
}
OpenPrice(value: any) {
this.changeId = value.id;
- this.isVisible = true
+ this.isVisible = true;
}
- /**
- * 浮动费用查看
- */
+ /**
+ * 浮动费用查看
+ */
FloatView(item: any) {
- console.log(item)
+ console.log(item);
this.changeViewId = item.id;
- this.service.request(this.service.$api_getChangeRecordWholeDetail, {id: this.changeViewId}).subscribe((res) => {
+ this.service.request(this.service.$api_getChangeRecordWholeDetail, { id: this.changeViewId }).subscribe(res => {
this.ViewCause = res;
- })
- this.isVisibleView = true
+ });
+ this.isVisibleView = true;
}
- /**
- *查看评价
- */
+ /**
+ *查看评价
+ */
viewEvaluate(item: any) {
- console.log(item)
- this.isVisibleEvaluate = true
+ console.log(item);
+ this.isVisibleEvaluate = true;
const params = {
businessCode: item.billCode,
- evaluateUserId: item.shipperAppUserId,
- }
+ evaluateUserId: item.shipperAppUserId
+ };
const params2 = {
businessCode: item.billCode,
- evaluateUserId: item.shipperAppUserId,
- }
+ evaluateUserId: item.shipperAppUserId
+ };
this.service.request(this.service.$api_getBillEvaluateByShipper, params).subscribe(res => {
- console.log(res)
- this.shipList = res.evaluateInfos
-
+ console.log(res);
+ this.shipList = res.evaluateInfos;
});
this.service.request(this.service.$api_getBillEvaluateDriverByShipper, params2).subscribe(res => {
- console.log(res)
- this.diverList = res.evaluateInfos
+ console.log(res);
+ this.diverList = res.evaluateInfos;
});
}
- /**
+ /**
*变更运费
*/
- updateFreight(item: any) {
- console.log(item?.isFreightChangeApplication)
+ updateFreight(item: any) {
+ console.log(item?.isFreightChangeApplication);
this.service.request(this.service.$api_get_getFreightChangeWholeDetail, { id: item.id }).subscribe(data => {
if (data) {
const modal = this.modal.create({
nzTitle: '变更运费',
nzWidth: 580,
nzContent: VehicleUpdateFreightComponent,
- nzComponentParams: { data: { ...data, id: item.id,isFreightChangeApplication: item?.isFreightChangeApplication } },
- nzFooter: null,
+ nzComponentParams: { data: { ...data, id: item.id, isFreightChangeApplication: item?.isFreightChangeApplication } },
+ nzFooter: null
});
- modal.afterClose.subscribe((res: Boolean) => {
- if(res) {
+ modal.afterClose.subscribe((res: Boolean) => {
+ if (res) {
this.st.load();
- this.getGoodsSourceStatistical()
+ this.getGoodsSourceStatistical();
}
});
}
@@ -705,33 +690,33 @@ resourceStatus: any;
/**
*修改附加费率
*/
- modifyRate() {
+ modifyRate() {
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
- if(params.length === 0) {
- this.service.msgSrv.error('请先选择订单！')
- return
+ if (params.length === 0) {
+ this.service.msgSrv.error('请先选择订单！');
+ return;
}
- const modal = this.modal.create({
- nzTitle: '修改附加费率',
- nzWidth: 600,
- nzContent: VehicleModifyRateComponent,
- nzComponentParams: { data: { ids: params } },
- nzFooter: null,
- });
- modal.afterClose.subscribe((result) => {
- if (result) {
- this.st.load(1);
- this.getGoodsSourceStatistical()
- }
- });
+ const modal = this.modal.create({
+ nzTitle: '修改附加费率',
+ nzWidth: 600,
+ nzContent: VehicleModifyRateComponent,
+ nzComponentParams: { data: { ids: params } },
+ nzFooter: null
+ });
+ modal.afterClose.subscribe(result => {
+ if (result) {
+ this.st.load(1);
+ this.getGoodsSourceStatistical();
+ }
+ });
}
- /**
+ /**
*修改网络货运人
*/
- modifyFreightPeople() {
+ modifyFreightPeople() {
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
@@ -740,63 +725,63 @@ resourceStatus: any;
this.selectedRows.forEach(item => {
params2.push(item.enterpriseInfoId);
});
- if(params.length === 0) {
- this.service.msgSrv.error('请先选择订单！')
- return
+ if (params.length === 0) {
+ this.service.msgSrv.error('请先选择订单！');
+ return;
}
- const modal = this.modal.create({
- nzTitle: '修改网络货运人',
- nzWidth: 600,
- nzContent: VehicleFreightPeopleComponent,
- nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2, } },
- nzFooter: null,
- });
- modal.afterClose.subscribe((result) => {
- if (result) {
- this.st.load(1);
- this.getGoodsSourceStatistical()
- }
- });
+ const modal = this.modal.create({
+ nzTitle: '修改网络货运人',
+ nzWidth: 600,
+ nzContent: VehicleFreightPeopleComponent,
+ nzComponentParams: { data: { ids: params, enterpriseInfoIds: params2 } },
+ nzFooter: null
+ });
+ modal.afterClose.subscribe(result => {
+ if (result) {
+ this.st.load(1);
+ this.getGoodsSourceStatistical();
+ }
+ });
}
- /**
+ /**
*修改网络货运人
*/
- modifycaptain() {
+ modifycaptain() {
let params: any[] = [];
this.selectedRows.forEach(item => {
params.push(item.id);
});
- if(params.length === 0) {
- this.service.msgSrv.error('请先选择订单！')
- return
+ if (params.length === 0) {
+ this.service.msgSrv.error('请先选择订单！');
+ return;
}
- const modal = this.modal.create({
- nzTitle: '修改车队长',
- nzWidth: 900,
- nzContent: VehicleModifyCaptainComponent,
- nzComponentParams: { data: { ids: params, } },
- nzFooter: null,
- // nzOnOk: sin => {
- // this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
- // if (res) {
- // this.service.msgSrv.success('变更运费成功');
- // modal.destroy();
- // this.st.reload();
- // }
- // });
- // return false;
- // }
- });
- modal.afterClose.subscribe((result) => {
- if (result) {
- this.st.load(1);
- this.getGoodsSourceStatistical()
- }
- });
+ const modal = this.modal.create({
+ nzTitle: '修改车队长',
+ nzWidth: 900,
+ nzContent: VehicleModifyCaptainComponent,
+ nzComponentParams: { data: { ids: params } },
+ nzFooter: null
+ // nzOnOk: sin => {
+ // this.service.request(this.service.$api_change_bulk, { billId: item.id, ...sin.sf.value }).subscribe(res => {
+ // if (res) {
+ // this.service.msgSrv.success('变更运费成功');
+ // modal.destroy();
+ // this.st.reload();
+ // }
+ // });
+ // return false;
+ // }
+ });
+ modal.afterClose.subscribe(result => {
+ if (result) {
+ this.st.load(1);
+ this.getGoodsSourceStatistical();
+ }
+ });
}
-
+
// *确认签收
-
+
confirmReceipt(item: any) {
const modalRef = this.modal.create({
nzTitle: '确认签收',
@@ -809,67 +794,67 @@ resourceStatus: any;
nzFooter: null
});
}
- revoke(item: any) {
- this.modal.confirm({
- nzTitle: '是否确定立即撤销费用变更！',
- nzOnOk: () =>
- this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id}).subscribe((res) => {
- console.log(res)
- if(res) {
- this.service.msgSrv.success('撤销成功！')
- this.stFloat.reload()
+ revoke(item: any) {
+ this.modal.confirm({
+ nzTitle: '是否确定立即撤销费用变更！',
+ nzOnOk: () =>
+ this.service.request(this.service.$api_get_revokeChangeRecord, { id: item.id }).subscribe(res => {
+ console.log(res);
+ if (res) {
+ this.service.msgSrv.success('撤销成功！');
+ this.stFloat.reload();
}
})
- });
+ });
+ }
+ // 取消订单
+ cancellation(item: any) {
+ // api_get_cancelAnOrder
+ this.modal.confirm({
+ nzTitle: '
确定取消该订单吗?',
+ nzContent: `
取消后无法恢复，请确认`,
+ nzOnOk: () =>
+ this.service.request(this.service.$api_get_cancelAnOrder, { id: item.id }).subscribe(res => {
+ if (res === true) {
+ this.service.msgSrv.success('操作成功！');
+ this.st.load(1);
+ this.getGoodsSourceStatistical();
+ this.initST();
+ }
+ })
+ });
+ }
+ userAction() {
+ let params: any[] = [];
+ if (this.selectedRows.length <= 0) {
+ this.service.msgSrv.warning('请选择需要签收的订单！');
+ return;
}
- // 取消订单
- cancellation(item: any) {
- // api_get_cancelAnOrder
- this.modal.confirm({
- nzTitle: '
确定取消该订单吗?',
- nzContent: `
取消后无法恢复，请确认`,
- nzOnOk: () =>
- this.service.request(this.service.$api_get_cancelAnOrder, {id: item.id}).subscribe((res) => {
- if (res === true) {
- this.service.msgSrv.success('操作成功！');
- this.st.load(1);
- this.getGoodsSourceStatistical()
- this.initST();
- }
- }),
- })
- }
- userAction() {
- let params: any[] = [];
- if (this.selectedRows.length <= 0) {
- this.service.msgSrv.warning("请选择需要签收的订单！")
- return;
+ let flag = true;
+ this.selectedRows.forEach(item => {
+ if (item.billStatus !== '4') {
+ this.service.msgSrv.warning('存在非待签收状态订单，无法签收！');
+ flag = false;
}
- let flag = true;
- this.selectedRows.forEach(item => {
- if(item.billStatus !=='4'){
- this.service.msgSrv.warning("存在非待签收状态订单，无法签收！")
- flag = false;
- }
- params.push(item.id);
- });
- if(!flag) return;
- this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
- if (res) {
- console.log(res);
- this.st.load(1);
- this.getGoodsSourceStatistical()
- }
- });
- }
- // 修改订单
+ params.push(item.id);
+ });
+ if (!flag) return;
+ this.service.request(this.service.$api_get_batchSignWholeOrder, params).subscribe(res => {
+ if (res) {
+ console.log(res);
+ this.st.load(1);
+ this.getGoodsSourceStatistical();
+ }
+ });
+ }
+ // 修改订单
changeOrder(value: any) {
this.router.navigate(['order-management/vehicle-detailChange', value.id]);
}
- /**
+ /**
*申请退款
*/
- applyRefund(item: any) {
+ applyRefund(item: any) {
const modalRef = this.modal.create({
nzTitle: '申请退款',
nzContent: OneCarOrderCancelConfirmComponent,
@@ -880,27 +865,27 @@ resourceStatus: any;
nzFooter: null
});
modalRef.afterClose.subscribe((res: boolean) => {
- if(res) {
+ if (res) {
this.resetSF;
this.st.load();
}
});
}
- /**
+ /**
*查看轨迹
*/
- viewTrack(item: any) {
+ viewTrack(item: any) {
const modalRef = this.modal.create({
nzTitle: '查看轨迹',
nzContent: OneCarOrderViewtrackComponent,
nzWidth: '800px',
nzComponentParams: {
- i: item,
+ i: item
},
nzFooter: null
});
modalRef.afterClose.subscribe((res: boolean) => {
- if(res) {
+ if (res) {
}
});
}
diff --git a/src/app/shared/shared-zorro.module.ts b/src/app/shared/shared-zorro.module.ts
index 2682add7..da706a62 100644
--- a/src/app/shared/shared-zorro.module.ts
+++ b/src/app/shared/shared-zorro.module.ts
@@ -47,6 +47,7 @@ import { NzAffixModule } from 'ng-zorro-antd/affix';
import { NzTypographyModule } from 'ng-zorro-antd/typography';
import { NzSwitchModule } from 'ng-zorro-antd/switch';
import { NzImageModule } from 'ng-zorro-antd/image';
+import { NzDrawerModule } from 'ng-zorro-antd/drawer';
export const SHARED_ZORRO_MODULES = [
NzButtonModule,
NzGridModule,
@@ -87,5 +88,6 @@ export const SHARED_ZORRO_MODULES = [
NzAffixModule,
NzTypographyModule,
NzSwitchModule,
- NzImageModule
+ NzImageModule,
+ NzDrawerModule
];
diff --git a/src/styles.less b/src/styles.less
index 7053b07c..fada8239 100644
--- a/src/styles.less
+++ b/src/styles.less
@@ -7,59 +7,64 @@
@import './styles/theme';
.icon {
- width : 18px;
- fill : currentColor;
- overflow : hidden;
- font-size: 18px !important;
- color : #ffffff;
- margin-right: 10px;
+ width : 18px;
+ fill : currentColor;
+ overflow : hidden;
+ font-size : 18px !important;
+ color : #ffffff;
+ margin-right: 10px;
}
@layout-gutter: 8px;
/* 全局滚动条美化 */
*::-webkit-scrollbar {
- width : (@layout-gutter);
- height: (@layout-gutter);
+ width : (@layout-gutter);
+ height: (@layout-gutter);
}
*::-webkit-scrollbar-thumb {
- background : #d9d9d9;
- cursor : pointer;
- border-radius: (@layout-gutter) / 2;
+ background : #d9d9d9;
+ cursor : pointer;
+ border-radius: (@layout-gutter) / 2;
}
/* 全局隐藏input-number上下箭头 谷歌*/
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
- -webkit-appearance: none;
+ -webkit-appearance: none;
}
/* 全局隐藏input-number上下箭头 火狐*/
input[type="number"] {
- -moz-appearance: textfield;
+ -moz-appearance: textfield;
}
.alain-pro__sider-logo {
- padding-left: 12px;
+ padding-left: 12px;
}
.break-word-all {
- word-break: break-all;
- word-wrap : break-word;
+ word-break: break-all;
+ word-wrap : break-word;
}
+
st {
- .block-td {
- .ant-divider-vertical {
- display: none;
- margin: 0;
- border-left: none;
- }
-
- st-td {
- span>a {
- display: block;
- }
+ .block-td {
+ .ant-divider-vertical {
+ display : none;
+ margin : 0;
+ border-left: none;
+ }
+
+ st-td {
+ span>a {
+ display: block;
}
}
- }
\ No newline at end of file
+ }
+}
+
+nz-range-picker {
+ width: 100%;
+}
\ No newline at end of file
diff --git a/src/styles/compact.less b/src/styles/compact.less
index 54fead68..1fb4892b 100644
--- a/src/styles/compact.less
+++ b/src/styles/compact.less
@@ -1,80 +1,112 @@
-
-.alain-pro__sider-logo h1{
+.alain-pro__sider-logo h1 {
font-size: 15px !important;
}
-.page-header__title{
+
+.page-header__title {
font-size: 14px !important;
}
-.alain-pro__body{
+
+.alain-pro__body {
margin: 12px 12px 0px !important;
}
-.alain-pro__page-header-content{
+
+.alain-pro__page-header-content {
margin: 8px 8px 0 !important;
}
.ant-card {
margin-bottom: 8px !important;
}
-.ant-table tfoot>tr>td, .ant-table tfoot>tr>th, .ant-table-tbody>tr>td, .ant-table-thead>tr>th{
+
+.ant-table tfoot>tr>td,
+.ant-table tfoot>tr>th,
+.ant-table-tbody>tr>td,
+.ant-table-thead>tr>th {
padding: 6px 10px;
}
-.alain-pro__page-header-wrapper{
+
+.alain-pro__page-header-wrapper {
margin: 0 !important
}
-.alain-pro__menu-icon{
- margin: 3px 5px 0 0 ;
+
+.alain-pro__menu-icon {
+ margin : 3px 5px 0 0;
font-size: 14px !important;
}
+
.sf__compact .ant-form-item {
- margin-top: 4px !important;
+ margin-top : 4px !important;
margin-bottom: 4px !important;
}
-.body-box{
+
+.body-box {
max-width: 760px !important;
- .box-content{
+
+ .box-content {
height: 77% !important;
}
}
-.login-logo{
- width:250px !important;
+
+.login-logo {
+ width : 250px !important;
height: 100% !important;
}
-.ant-tabs-tab-btn{
+
+.ant-tabs-tab-btn {
font-size: 18px !important;
}
-.login-box-content{
+
+.login-box-content {
max-width: 300px !important;
- height: 100% !important;
- padding: 58px 0 38px !important;
+ height : 100% !important;
+ padding : 58px 0 38px !important;
}
+
.total-footer {
bottom: 10px !important;
}
-.ant-layout-header{
- height: 44px;
- padding: 0 25px;
+
+.ant-layout-header {
+ height : 44px;
+ padding : 0 25px;
line-height: 44px;
- img{
+
+ img {
width: 22px
}
- .title{
+
+ .title {
font-size: 14px;
}
}
-.ant-tabs-tab-btn{
+
+.ant-tabs-tab-btn {
font-size: 14px !important;
}
-.ant-row{
- margin-left: 0px !important;
+
+.ant-row {
+ margin-left : 0px !important;
margin-right: 0px !important;
}
-h2{
+
+h2 {
font-size: 16px !important;
}
-.sv__container{
+
+.sv__container {
padding: 0 !important;
}
+
.alain-pro__menu-side .alain-pro__main .affix {
- top: 0 !important;
+ top : 0 !important;
left: 215px !important;
+}
+
+.table-box {
+ margin: -12px -12px 0 !important;
+
+ .ant-tabs-tab {
+ padding: 12px 0px !important;
+ margin : 0 0 0 16px !important;
+ }
}
\ No newline at end of file