diff --git a/proxy.conf.js b/proxy.conf.js index 3804ecdd..d67d6ede 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -1,7 +1,7 @@ /* * @Author: your name * @Date: 2021-12-07 19:42:53 - * @LastEditTime: 2022-01-13 09:50:11 + * @LastEditTime: 2022-01-13 10:20:45 * @LastEditors: Please set LastEditors * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath: \tms-obc-web\proxy.conf.js @@ -24,7 +24,7 @@ module.exports = { // } '//api': { target: { - host: 'tms-api-test.eascs.com', + host: 'tms-api-dev.eascs.com', protocol: 'https:', port: 443 }, 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 c88cc5bc..9ee867d8 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 @@ -17,7 +17,7 @@ - +
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 f8230b5b..a16a9cdc 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 @@ -142,22 +142,33 @@ export class SupplyManagementVehicleDetailComponent implements OnInit { } /** - * 重新指派 - */ + * 重新指派 + */ assignedCar(item: any) { + const { id } = item; + console.log(id) const modalRef = this.modal.create({ nzTitle: '指派熟车', nzWidth: '1200px', nzContent: SupplyManagementVehicleAssignedCarComponent, nzComponentParams: { i: item, + status: 'anew', + params: { id }, + url: this.service.$api_save_assign_vehicle, }, nzFooter: null, }); modalRef.afterClose.subscribe((result) => { if (result) { - this.getGoodsSourceDetail(); + } + }); + } + nextOrder(item: any) { + this.router.navigate(['/supply-management/vehicle-amend', item.id], { + queryParams: { + sta: 2 } }); } diff --git a/src/app/routes/vehicle/components/audit/detail/detail.component.html b/src/app/routes/vehicle/components/audit/detail/detail.component.html index be5241e3..c9d4ea19 100644 --- a/src/app/routes/vehicle/components/audit/detail/detail.component.html +++ b/src/app/routes/vehicle/components/audit/detail/detail.component.html @@ -135,8 +135,11 @@ [placeholder]="isEdit?'':'-'"> - + + + +