解决冲突
This commit is contained in:
wangshiming
@ -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',
|
||||
|
||||
@ -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 @@
|
||||
|
||||
<div class="modal-footer">
|
||||
<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>
|
||||
|
||||
@ -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',
|
||||
|
||||
Reference in New Issue
Block a user