Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wangshiming
2022-04-20 14:54:49 +08:00
parent 59b6c52e8a
commit 993a664514
6 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
proxy.conf.js
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-18 09:51:21 * @Date : 2022-01-18 09:51:21
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-04-20 13:45:11 * @LastEditTime : 2022-04-20 14:18:40
* @FilePath : \\tms-obc-web\\proxy.conf.js * @FilePath : \\tms-obc-web\\proxy.conf.js
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -18,19 +18,9 @@ module.exports = {
// secure: false, // Ignore invalid SSL certificates // secure: false, // Ignore invalid SSL certificates
// changeOrigin: true // changeOrigin: true
// } // }
'//api': {
target: {
host: 'tms-api.yunduoxing.com',
protocol: 'https:',
port: 443
},
secure: false,
changeOrigin: true,
logLevel: 'debug'
},
// '//api': { // '//api': {
// target: { // target: {
// host: 'tms-api-dev.eascs.com', // host: 'tms-api.yunduoxing.com',
// protocol: 'https:', // protocol: 'https:',
// port: 443 // port: 443
// }, // },
@ -38,4 +28,14 @@ module.exports = {
// changeOrigin: true, // changeOrigin: true,
// logLevel: 'debug' // logLevel: 'debug'
// }, // },
'//api': {
target: {
host: 'tms-api-test.eascs.com',
protocol: 'https:',
port: 443
},
secure: false,
changeOrigin: true,
logLevel: 'debug'
},
}; };

34
src/app/routes/order-management/components/bulk-detail-change/bulk-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-24 16:58:02 * @Date : 2021-12-24 16:58:02
* @LastEditors : Shiming * @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 * @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. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -146,7 +146,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`, `上传位置:${this.i?.unLoadingPlaceList[0]?.province}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -192,7 +192,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`, `上传位置:${this.i?.unLoadingPlaceList[0]?.province}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -246,7 +246,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`, `上传位置:${this.i?.unLoadingPlaceList[1]?.province}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -292,7 +292,7 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`, `上传位置:${this.i?.unLoadingPlaceList[1]?.province}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -571,21 +571,21 @@ export class OrderManagementBulkDetailChangeComponent implements OnInit {
acceptVolume: this.sf4.value?.acceptVolume, acceptVolume: this.sf4.value?.acceptVolume,
settlementWeight: this.sf4.value?.settlementWeight, settlementWeight: this.sf4.value?.settlementWeight,
settlementVolume: this.sf4.value?.settlementVolume, settlementVolume: this.sf4.value?.settlementVolume,
loadingLadingBillFilePath: this.sf.value?.loadingLadingBillFilePath?.data loadingLadingBillFilePath: this.sf?.value?.loadingLadingBillFilePath?.data
? this.sf.value?.loadingLadingBillFilePath.data.fullFilePath ? this.sf?.value?.loadingLadingBillFilePath.data.fullFilePath
: this.sf.value?.loadingLadingBillFilePath?.url, : this.sf?.value?.loadingLadingBillFilePath?.url,
loadingPeopleVehiclesGoodsFilePath: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.data loadingPeopleVehiclesGoodsFilePath: this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.data
? this.sf.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath ? this.sf?.value?.loadingPeopleVehiclesGoodsFilePath.data.fullFilePath
: this.sf.value?.loadingPeopleVehiclesGoodsFilePath?.url, : this.sf?.value?.loadingPeopleVehiclesGoodsFilePath?.url,
unloadingLadingBillFilePath: this.sf.value?.unloadingLadingBillFilePath?.data unloadingLadingBillFilePath: this.sf?.value?.unloadingLadingBillFilePath?.data
? this.sf.value?.unloadingLadingBillFilePath.data.fullFilePath ? this.sf?.value?.unloadingLadingBillFilePath.data.fullFilePath
: this.sf.value?.unloadingLadingBillFilePath?.url, : this.sf?.value?.unloadingLadingBillFilePath?.url,
unloadingPeopleVehiclesGoodsFilePath: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.data unloadingPeopleVehiclesGoodsFilePath: this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.data
? this.sf.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath ? this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath.data.fullFilePath
: this.sf.value?.unloadingPeopleVehiclesGoodsFilePath?.url : this.sf?.value?.unloadingPeopleVehiclesGoodsFilePath?.url
}; };
this.service.request(this.service.$api_set_modifyBulkOrder, params).subscribe((res: any) => { this.service.request(this.service.$api_set_modifyBulkOrder, params).subscribe((res: any) => {
if (res) { if (res) {

10
src/app/routes/order-management/components/vehicle-detail-change/vehicle-detail-change.component.ts
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-23 13:39:58 * @Date : 2021-12-23 13:39:58
* @LastEditors : Shiming * @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 * @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. * Copyright (C) 2022 huzhenhong. All rights reserved.
*/ */
@ -137,7 +137,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`, `上传位置:${this.i?.unLoadingPlaceList[0]?.province}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -183,7 +183,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.loadingAddressArr[0]}`, `上传位置:${this.i?.unLoadingPlaceList[0]?.province}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -237,7 +237,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`, `上传位置:${this.i?.unLoadingPlaceList[1]?.province}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -283,7 +283,7 @@ export class OrderManagementVehicleDetailChangeComponent implements OnInit {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.i?.unloadingAddressArr[0]}`, `上传位置:${this.i?.unLoadingPlaceList[1]?.province}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',

33
src/app/routes/order-management/modal/vehicle/sure-arrive/sure-arrive.component.ts
View File

@ -20,7 +20,6 @@ import { WaybillManagementServe } from 'src/app/routes/waybill-management/servic
providers: [DatePipe] providers: [DatePipe]
}) })
export class VehicleSureArriveComponent implements OnInit { export class VehicleSureArriveComponent implements OnInit {
record: any = {};
i: any; i: any;
formData: any; formData: any;
Status: any; Status: any;
@ -70,8 +69,8 @@ export class VehicleSureArriveComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadingPlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -115,8 +114,8 @@ export class VehicleSureArriveComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadingPlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -168,8 +167,8 @@ export class VehicleSureArriveComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`, `上传位置:${this.i?.dischargePlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -213,8 +212,8 @@ export class VehicleSureArriveComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`, `上传位置:${this.i?.dischargePlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -283,8 +282,8 @@ export class VehicleSureArriveComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadingPlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -328,8 +327,8 @@ export class VehicleSureArriveComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadingPlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -381,8 +380,8 @@ export class VehicleSureArriveComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`, `上传位置:${this.i?.dischargePlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -426,8 +425,8 @@ export class VehicleSureArriveComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.unloadingAddressArr[0]}`, `上传位置:${this.i?.dischargePlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',

4
src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2021-12-15 13:17:42 * @Date : 2021-12-15 13:17:42
* @LastEditors : Shiming * @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 * @FilePath : \\tms-obc-web\\src\\app\\routes\\order-management\\modal\\vehicle\\sure-depart\\sure-depart.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -26,5 +26,5 @@
<div class="modal-footer"> <div class="modal-footer">
<button nz-button type="button" (click)="close()">关闭</button> <button nz-button type="button" (click)="close()">关闭</button>
<button nz-button type="submit" nzType="primary" (click)="save(sf.value)" [nzLoading]="http.loading">确认发车</button> <button nz-button type="submit" nzType="primary" *ngIf="schema" (click)="save(sf.value)" [nzLoading]="http.loading">确认发车</button>
</div> </div>

24
src/app/routes/order-management/modal/vehicle/sure-depart/sure-depart.component.ts
View File

@ -37,13 +37,17 @@ export class VehicleSureDepartComponent implements OnInit {
public service: WaybillManagementServe, public service: WaybillManagementServe,
private envSrv: EAEnvironmentService, private envSrv: EAEnvironmentService,
private datePipe: DatePipe private datePipe: DatePipe
) { } ) {
}
ngOnInit(): void { ngOnInit(): void {
this.initSF();
console.log(this.i); console.log(this.i);
this.initSF();
this.data.weight = this.i?.weight; this.data.weight = this.i?.weight;
this.i.time = this.i.loadingTime; this.i.time = this.i.loadingTime;
} }
initSF() { initSF() {
if (this.Status === 1) { if (this.Status === 1) {
@ -77,8 +81,8 @@ export class VehicleSureDepartComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadingPlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -122,8 +126,8 @@ export class VehicleSureDepartComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadingPlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -200,8 +204,8 @@ export class VehicleSureDepartComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadingPlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',
@ -245,8 +249,8 @@ export class VehicleSureDepartComponent implements OnInit {
data: { data: {
appId: this.envSrv.env.appId, appId: this.envSrv.env.appId,
content: [ content: [
`上传用户:${this.record?.driverName}(${this.record?.driverTelephone})`, `上传用户:${this.i?.driverName}(${this.i?.driverTelephone})`,
`上传位置:${this.record?.loadingAddressArr[0]}`, `上传位置:${this.i?.loadingPlace[0]}`,
`上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`, `上传时间:${format(new Date(), 'yyyy-MM-dd HH:mm:ss')}`,
], ],
position: '2', position: '2',