diff --git a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts index 05fcd6d7..494b75b4 100644 --- a/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts +++ b/src/app/routes/order-management/modal/bulk/update-freight/update-freight.component.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-14 14:03:07 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:21:33 + * @LastEditTime : 2022-01-24 16:28:40 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\bulk\\update-freight\\update-freight.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -205,6 +205,7 @@ export class UpdateFreightComponent implements OnInit { } save(value: any): void { + console.log(this.sf.value) if (!this.sf.valid) { this.sf.validator({ emitError: true }); return; 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 7189e67c..4f504bc6 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 @@ -14,7 +14,6 @@
网络货运人:{{ i?.shipperAppUserName }}
-
diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts index ac6c1bb2..9eca7624 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.ts @@ -105,21 +105,6 @@ export class SupplyManagementBulkDetailComponent implements OnInit { // }); } - /** - * 指派熟车 - */ - assignedCar(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '指派熟车', - // nzWidth: '90%', - // nzContent: PublishGoodsChooseFamifiarComponent, - // nzComponentParams: { - // i: this.i, - // }, - // nzFooter: null, - // }); - } - /** * 查看当前指派 */ diff --git a/src/app/routes/supply-management/components/bulk/bulk.component.ts b/src/app/routes/supply-management/components/bulk/bulk.component.ts index 9b39a347..664a4f5e 100644 --- a/src/app/routes/supply-management/components/bulk/bulk.component.ts +++ b/src/app/routes/supply-management/components/bulk/bulk.component.ts @@ -318,11 +318,6 @@ export class SupplyManagementBulkComponent implements OnInit { text: '再下一单', click: (_record) => this.nextOrder(_record), }, - { - text: '重新指派', - click: (_record) => this.assignedCar(_record), - iif: item => item.auditStatus == 2, - }, ], }, ]; @@ -332,40 +327,6 @@ export class SupplyManagementBulkComponent implements OnInit { // .createStatic(FormEditComponent, { i: { id: 0 } }) // .subscribe(() => this.st.reload()); } - /** - * 重新指派 - */ - assignedCar(item: any) { - // const modalRef = this.modal.create({ - // nzTitle: '指派熟车', - // nzWidth: '1500px', - // nzContent: SupplyManagementBulkAssignedCarComponent, - // nzComponentParams: { - // i: item - // }, - // nzFooter: null, - - // }); - // modalRef.afterClose.subscribe((result) => { - // if (result) { - // this.st.reload(); - // } - // }); - const modalRef = this.modal.create({ - nzTitle: '指派熟车', - nzContent: PublishGoodsChooseFamifiarComponent, - nzComponentParams: { - submitParams: item, - submitUrl: this.service.$api_save_bulk_assign - }, - nzWidth: 1300 - }); - modalRef.afterClose.subscribe(result => { - if (result) { - this.st.reload(1); - } - }); - } /** * 查询字段个数 */ 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 a535e01b..7676967e 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 @@ -152,7 +152,7 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { i: item, status: 'anew', params: { id }, - url: this.service.$api_save_assign_whole, + url: this.service.$api_save_assign_vehicle, }, nzFooter: null, 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 8133d6f3..e84d0a48 100644 --- a/src/app/routes/supply-management/components/vehicle/vehicle.component.ts +++ b/src/app/routes/supply-management/components/vehicle/vehicle.component.ts @@ -174,7 +174,7 @@ export class SupplyManagementVehicleComponent implements OnInit { i: item, status: 'anew', params: { id }, - url: this.service.$api_save_assign_whole + url: this.service.$api_save_assign_vehicle }, nzFooter: null }); 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 e89e82b6..1f1796ee 100644 --- a/src/app/routes/supply-management/services/supply-management.service.ts +++ b/src/app/routes/supply-management/services/supply-management.service.ts @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-03 11:10:14 * @LastEditors : Shiming - * @LastEditTime : 2022-01-20 10:57:13 + * @LastEditTime : 2022-01-24 16:36:35 * @FilePath : \\tms-obc-web\\src\\app\\routes\\supply-management\\services\\supply-management.service.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -62,7 +62,7 @@ export class SupplyManagementService extends BaseService { $api_add_car_caption = `/api/mdc/userDriverExpand/addCarCaptainForShiper`; // 设置为车队长 $api_get_goods_resource_shipper = `/api/sdc/goodsResourceShipper/modifyPricePre`; // 修改单价页面根据货源ID获取货物表 $api_get_car_captain_by_mobile = `/api/mdc/userDriverExpand/getCarCaptainByMobile`; // 查询车队长或者司机列表 - // $api_save_assign_vehicle = `/api/sdc/goodsResourceShipper/reAssignWhole`; // 货主端大宗货源重新指派 + $api_save_assign_vehicle = `/api/sdc/goodsResourceShipper/reAssignWhole`; // 整车货源重新指派 $api_save_assign_bulk = `/api/sdc/goodsResourceShipper/reAssignBulk`; // 货主端大宗货源指派熟车 // 整车再下一单指派熟车