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

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]
})
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',