From 993a664514f4f7043efbb7a68148b3f8a886ecbc Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 20 Apr 2022 14:54:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- proxy.conf.js | 24 ++++++------- .../bulk-detail-change.component.ts | 34 +++++++++---------- .../vehicle-detail-change.component.ts | 10 +++--- .../sure-arrive/sure-arrive.component.ts | 33 +++++++++--------- .../sure-depart/sure-depart.component.html | 4 +-- .../sure-depart/sure-depart.component.ts | 24 +++++++------ 6 files changed, 66 insertions(+), 63 deletions(-) diff --git a/proxy.conf.js b/proxy.conf.js index 5dd5c8b2..eb92fbd4 100644 --- a/proxy.conf.js +++ b/proxy.conf.js @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2022-01-18 09:51:21 * @LastEditors : Shiming - * @LastEditTime : 2022-04-20 13:45:11 + * @LastEditTime : 2022-04-20 14:18:40 * @FilePath : \\tms-obc-web\\proxy.conf.js * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -18,19 +18,9 @@ module.exports = { // secure: false, // Ignore invalid SSL certificates // changeOrigin: true // } - '//api': { - target: { - host: 'tms-api.yunduoxing.com', - protocol: 'https:', - port: 443 - }, - secure: false, - changeOrigin: true, - logLevel: 'debug' - }, // '//api': { // target: { - // host: 'tms-api-dev.eascs.com', + // host: 'tms-api.yunduoxing.com', // protocol: 'https:', // port: 443 // }, @@ -38,4 +28,14 @@ module.exports = { // changeOrigin: true, // logLevel: 'debug' // }, + '//api': { + target: { + host: 'tms-api-test.eascs.com', + protocol: 'https:', + port: 443 + }, + secure: false, + changeOrigin: true, + logLevel: 'debug' + }, }; 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 e2fd7084..ac3a410b 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-24 16:58:02 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 19:26:19 + * @LastEditTime : 2022-04-20 14:46:48 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\bulk-detail-change\\bulk-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -146,7 +146,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { appId: this.envSrv.env.appId, content: [ `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, - `上传位置:${this.i?.loadingAddressArr[0]}`, + `上传位置:${this.i?.unLoadingPlaceList[0]?.province}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -192,7 +192,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { appId: this.envSrv.env.appId, content: [ `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, - `上传位置:${this.i?.loadingAddressArr[0]}`, + `上传位置:${this.i?.unLoadingPlaceList[0]?.province}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -246,7 +246,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { appId: this.envSrv.env.appId, content: [ `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, - `上传位置:${this.i?.unloadingAddressArr[0]}`, + `上传位置:${this.i?.unLoadingPlaceList[1]?.province}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -292,7 +292,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { appId: this.envSrv.env.appId, content: [ `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, - `上传位置:${this.i?.unloadingAddressArr[0]}`, + `上传位置:${this.i?.unLoadingPlaceList[1]?.province}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -571,21 +571,21 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit { acceptVolume: this.sf4.value?.acceptVolume, settlementWeight: this.sf4.value?.settlementWeight, settlementVolume: this.sf4.value?.settlementVolume, - loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data - ? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath - : this.sf.value?.loadingLadingBillFilePath?.url, + loadingLadingBillFilePath: this.sf?.value?.loadingLadingBillFilePath?.data + ? this.sf?.value?.loadingLadingBillFilePath.data.fullFilePath + : this.sf?.value?.loadingLadingBillFilePath?.url, - loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data - ? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath - : this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url, + loadingPeopleVehiclesGoodsFilePath: this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.data + ? this.sf?.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath + : this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.url, - unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data - ? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath - : this.sf.value?.unloadingLadingBillFilePath?.url, + unloadingLadingBillFilePath: this.sf?.value?.unloadingLadingBillFilePath?.data + ? this.sf?.value?.unloadingLadingBillFilePath.data.fullFilePath + : this.sf?.value?.unloadingLadingBillFilePath?.url, - unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data - ? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath - : this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url + unloadingPeopleVehiclesGoodsFilePath: this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.data + ? this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath + : this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.url }; this.service.request(this.service.$api_set_modifyBulkOrder, params).subscribe((res: any) => { if (res) { 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 48c2c347..18126884 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 @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-23 13:39:58 * @LastEditors : Shiming - * @LastEditTime : 2022-04-11 19:26:34 + * @LastEditTime : 2022-04-20 14:48:08 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\components\\vehicle-detail-change\\vehicle-detail-change.component.ts * Copyright (C) 2022 huzhenhong. All rights reserved. */ @@ -137,7 +137,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { appId: this.envSrv.env.appId, content: [ `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, - `上传位置:${this.i?.loadingAddressArr[0]}`, + `上传位置:${this.i?.unLoadingPlaceList[0]?.province}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -183,7 +183,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { appId: this.envSrv.env.appId, content: [ `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, - `上传位置:${this.i?.loadingAddressArr[0]}`, + `上传位置:${this.i?.unLoadingPlaceList[0]?.province}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -237,7 +237,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { appId: this.envSrv.env.appId, content: [ `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, - `上传位置:${this.i?.unloadingAddressArr[0]}`, + `上传位置:${this.i?.unLoadingPlaceList[1]?.province}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -283,7 +283,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit { appId: this.envSrv.env.appId, content: [ `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, - `上传位置:${this.i?.unloadingAddressArr[0]}`, + `上传位置:${this.i?.unLoadingPlaceList[1]?.province}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', diff --git a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts index d39e4110..e74a8c1a 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts @@ -20,7 +20,6 @@ import { WaybillManagementServe } from 'src/app/routes/waybill-management/servic providers: [DatePipe] }) export class VehicleSureArriveComponent implements OnInit { - record: any = {}; i: any; formData: any; Status: any; @@ -70,8 +69,8 @@ export class VehicleSureArriveComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingPlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -115,8 +114,8 @@ export class VehicleSureArriveComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingPlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -168,8 +167,8 @@ export class VehicleSureArriveComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.dischargePlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -213,8 +212,8 @@ export class VehicleSureArriveComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.dischargePlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -283,8 +282,8 @@ export class VehicleSureArriveComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingPlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -328,8 +327,8 @@ export class VehicleSureArriveComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingPlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -381,8 +380,8 @@ export class VehicleSureArriveComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.dischargePlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -426,8 +425,8 @@ export class VehicleSureArriveComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.unloadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.dischargePlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html index 3c703e39..70bbdcae 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html +++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html @@ -4,7 +4,7 @@ * @Author : Shiming * @Date : 2021-12-15 13:17:42 * @LastEditors : Shiming - * @LastEditTime : 2022-01-18 17:24:01 + * @LastEditTime : 2022-04-20 14:26:51 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\sure-depart\\sure-depart.component.html * Copyright (C) 2022 huzhenhong. All rights reserved. --> @@ -26,5 +26,5 @@
- +
diff --git a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts index 5da8c701..70bdc1be 100644 --- a/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts +++ b/src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts @@ -37,13 +37,17 @@ export class VehicleSureDepartComponent implements OnInit { public service: WaybillManagementServe, private envSrv: EAEnvironmentService, private datePipe: DatePipe - ) { } + ) { + + } ngOnInit(): void { - this.initSF(); console.log(this.i); + this.initSF(); + this.data.weight = this.i?.weight; this.i.time = this.i.loadingTime; + } initSF() { if (this.Status === 1) { @@ -77,8 +81,8 @@ export class VehicleSureDepartComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingPlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -122,8 +126,8 @@ export class VehicleSureDepartComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingPlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -200,8 +204,8 @@ export class VehicleSureDepartComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingPlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', @@ -245,8 +249,8 @@ export class VehicleSureDepartComponent implements OnInit { data: { appId: this.envSrv.env.appId, content: [ - `上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, - `上传位置:${this.record?.loadingAddressArr[0]}`, + `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, + `上传位置:${this.i?.loadingPlace[0]}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, ], position: '2', From f7a6f32bbeb6748ba6a0a2eda0a036f9d7e50b6a Mon Sep 17 00:00:00 2001 From: wangshiming Date: Wed, 20 Apr 2022 15:01:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=BF=94=E4=BD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/driver/detail/detail.component.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/routes/usercenter/components/driver/detail/detail.component.html b/src/app/routes/usercenter/components/driver/detail/detail.component.html index 141ab9bc..1ff14602 100644 --- a/src/app/routes/usercenter/components/driver/detail/detail.component.html +++ b/src/app/routes/usercenter/components/driver/detail/detail.component.html @@ -265,13 +265,13 @@ {{ carDatail?.carNo }} - {{ carDatail?.carNoColor }} + {{ carDatail?.carNoColorLabel }} - {{ carDatail?.carModel }} + {{ carDatail?.carModelLabel }} - {{ carDatail?.carLength }} + {{ carDatail?.carLengthLabel ? carDatail?.carLengthLabel +'米' :'' }} {{ carDatail?.isDefault?'是':'否' }}