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

fix bug

Browse Source
This commit is contained in:
wangshiming
2022-02-10 17:18:26 +08:00
parent a110d88814
commit 0019e4730d
10 changed files with 100 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/routes/order-management/components/risk/risk.component.html
View File

@ -89,7 +89,7 @@
<div *ngFor="let i of item?.goodsInfoVOList">
<p>货物名称：{{i?.goodsName}}</p>
<p>重量/体积：{{i?.weight}}吨/{{i?.volume}}方</p>
<p>车型/车长：{{i?.maxWeight}}/ {{i?.maxCube}}</p>
<p>车型/车长：{{i?.carModel}}/ {{i?.carLength}}</p>
</div>
</ng-template>
</st>

2
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
View File

@ -66,7 +66,7 @@
</sv>
<sv label="货物数量"> {{ item?.weight }}吨 | {{ item?.volume }}方 </sv>
<sv label="剩余"> {{ 10 }}吨 | {{ 10 }}方 </sv>
<sv label="用车需求"> {{ item?.maxWeight }} | {{ item?.maxCube }}米 </sv>
<sv label="用车需求"> {{ item?.carModel }} | {{ item?.carLength }}米 </sv>
<sv label="承运信息">
{{ i?.carrierInformationVO?.driverName }} / {{ i?.carrierInformationVO?.driverTelephone }} /
{{ i?.carrierInformationVO?.driverLicensePlate }}

18
src/app/routes/supply-management/components/bulk-publish/bulk-publish.component.ts
View File

@ -353,7 +353,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
placeholder: '请输入'
}
},
maxWeight: {
carModel: {
type: 'string',
title: '车型/车长',
ui: {
@ -364,7 +364,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
errors: { required: '请选择车型' }
}
},
maxCube: {
carLength: {
type: 'string',
title: '',
ui: {
@ -376,7 +376,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
}
}
},
required: ['weight', 'maxWeight', 'maxCube', 'freightPrice', 'rule', 'settlementBasis']
required: ['weight', 'carModel', 'carLength', 'freightPrice', 'rule', 'settlementBasis']
};
this.ui4 = {
'*': {
@ -401,10 +401,10 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
$number: {
grid: { span: 8 }
},
$maxWeight: {
$carModel: {
grid: { span: 12 }
},
$maxCube: {
$carLength: {
grid: { span: 12 }
}
};
@ -680,8 +680,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
{
...this.sf4.value,
...this.sf3.value,
maxWeight: this.sf4.value.maxWeight.join(','),
maxCube: this.sf4.value.maxCube.join(',')
carModel: this.sf4.value.carModel.join(','),
carLength: this.sf4.value.carLength.join(',')
}
]
};
@ -926,8 +926,8 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
weight: res?.goodsInfoVOList[0]?.weight || '',
volume: res?.goodsInfoVOList[0]?.volume || '',
number: res?.goodsInfoVOList[0]?.number || '',
maxWeight: res?.goodsInfoVOList[0]?.maxWeight?.split(',') || '',
maxCube: res?.goodsInfoVOList[0]?.maxCube?.split(',') || ''
carModel: res?.goodsInfoVOList[0]?.carModel?.split(',') || '',
carLength: res?.goodsInfoVOList[0]?.carLength?.split(',') || ''
};
if (this.PageStatus === '大宗修改') {
this.sf4data.id = res?.goodsInfoVOList[0]?.id;

14
src/app/routes/supply-management/components/bulk-release-publish/bulk-release-publish.component.ts
View File

@ -373,7 +373,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
placeholder: '请输入'
}
},
maxWeight: {
carModel: {
type: 'string',
title: '车型/车长',
default: [],
@ -385,7 +385,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
errors: { required: '请选择车型' }
}
},
maxCube: {
carLength: {
type: 'string',
title: '',
default: [],
@ -398,7 +398,7 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
}
}
},
required: ['weight', 'maxWeight', 'maxCube', 'freightPrice', 'rule', 'settlementBasis']
required: ['weight', 'carModel', 'carLength', 'freightPrice', 'rule', 'settlementBasis']
};
this.ui4 = {
'*': {
@ -423,10 +423,10 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
$number: {
grid: { span: 8 }
},
$maxWeight: {
$carModel: {
grid: { span: 12 }
},
$maxCube: {
$carLength: {
grid: { span: 12 }
}
};
@ -598,8 +598,8 @@ export class SupplyManagementBulkReleasePublishComponent implements OnInit {
{
...sf3Values,
...this.sf4.value,
maxWeight: this.sf4.value.maxWeight.join(','),
maxCube: this.sf4.value.maxCube.join(',')
carModel: this.sf4.value.carModel.join(','),
carLength: this.sf4.value.carLength.join(',')
}
];
const params = {

14
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.html
View File

@ -67,10 +67,12 @@
</div>
</nz-form-item>
</div>
<button nz-button nzType="primary" (click)="addStartInfo($event)">
<i nz-icon nzType="plus"></i>
添加装货地
</button>
<div style="display: flex; justify-content: center;">
<button nz-button nzType="primary" (click)="addStartInfo($event)">
<i nz-icon nzType="plus"></i>
添加装货地
</button>
</div>
</div>
<div nz-col [nzSpan]="8">
<div style="display: flex; justify-content: center">
@ -126,11 +128,13 @@
</div>
</nz-form-item>
</div>
<div style="display: flex; justify-content: center;">
<button nz-button nzType="primary" (click)="addEndInfo($event)">
<i nz-icon nzType="plus"></i>
添加卸货地
</button>
</div>
</div>
</div>
<div nz-row [nzGutter]="24" style="margin-top: 24px">
<div nz-col [nzSpan]="9">
@ -142,6 +146,7 @@
nzFormat="yyyy-MM-dd HH:mm:ss"
formControlName="loadingTime"
[(ngModel)]="loadingTime"
(ngModelChange)="changeLO(loadingTime)"
></nz-date-picker>
</nz-form-control>
</nz-form-item>
@ -155,6 +160,7 @@
nzFormat="yyyy-MM-dd HH:mm:ss"
formControlName="unloadingTime"
[(ngModel)]="unloadingTime"
(ngModelChange)="changeUn(unloadingTime)"
></nz-date-picker>
</nz-form-control>
</nz-form-item>

68
src/app/routes/supply-management/components/onecar-publish/onecar-publish.component.ts
View File

@ -316,7 +316,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
placeholder: '请输入'
}
},
maxWeight: {
carModel: {
type: 'string',
title: '车型/车长',
ui: {
@ -327,7 +327,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
errors: { required: '请选择车型' }
}
},
maxCube: {
carLength: {
type: 'string',
title: '',
ui: {
@ -339,7 +339,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
}
},
required: ['weight', 'maxWeight', 'maxCube']
required: ['weight', 'carModel', 'carLength']
};
this.ui4 = {
'*': {
@ -355,10 +355,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
$number: {
grid: { span: 8 }
},
$maxWeight: {
$carModel: {
grid: { span: 12 }
},
$maxCube: {
$carLength: {
grid: { span: 12 }
}
};
@ -871,8 +871,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
{
...this.sf4.value,
...this.sf3.value,
maxWeight: this.sf4.value.maxWeight.join(','),
maxCube: this.sf4.value.maxCube.join(',')
carModel: this.sf4.value.carModel.join(','),
carLength: this.sf4.value.carLength.join(',')
}
]
};
@ -1076,8 +1076,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
weight: res?.goodsInfoVOList[0]?.weight,
volume: res?.goodsInfoVOList[0]?.volume,
vehicleDemand: res?.goodsInfoVOList[0]?.vehicleDemand,
maxCube: res?.goodsInfoVOList[0]?.maxCube?.split(','),
maxWeight: res?.goodsInfoVOList[0]?.maxWeight?.split(',') || '',
carLength: res?.goodsInfoVOList[0]?.carLength?.split(','),
carModel: res?.goodsInfoVOList[0]?.carModel?.split(',') || '',
number: res?.goodsInfoVOList[0]?.number,
goodsTypeName: res?.goodsInfoVOList[0]?.goodsTypeName,
modifyUserId: res?.goodsInfoVOList[0]?.modifyUserId,
@ -1171,4 +1171,54 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
}
});
}
changeUn(value: any) {
console.log(value)
if (typeof value !== 'string') {
var c = new Date(value);
value =
c.getFullYear() +
'-' +
this.addPreZero(c.getMonth() + 1) +
'-' +
this.addPreZero(c.getDate()) +
' ' +
this.addPreZero(c.getHours()) +
':' +
this.addPreZero(c.getMinutes()) +
':' +
this.addPreZero(c.getSeconds());
}
console.log(value)
console.log(this.loadingTime)
console.log(this.loadingTime > value)
if(this.loadingTime > value) {
console.log('错误')
this.unloadingTime = ''
}
}
changeLO(value: any) {
console.log(value)
if (typeof value !== 'string') {
var c = new Date(value);
value =
c.getFullYear() +
'-' +
this.addPreZero(c.getMonth() + 1) +
'-' +
this.addPreZero(c.getDate()) +
' ' +
this.addPreZero(c.getHours()) +
':' +
this.addPreZero(c.getMinutes()) +
':' +
this.addPreZero(c.getSeconds());
}
console.log(value)
console.log(this.unloadingTime)
console.log(this.unloadingTime > value)
if(this.unloadingTime > value) {
console.log('错误')
this.loadingTime = ''
}
}
}

4
src/app/routes/supply-management/components/release-publish/release-publish.component.html
View File

@ -76,11 +76,13 @@
</div>
<div nz-row>
<div nz-col [nzSpan]="4"></div>
<div style="display: flex; justify-content: center;">
<button nz-button nzType="primary" (click)="addStartInfo()">
<i nz-icon nzType="plus"></i>
添加装货地
</button>
</div>
</div>
</div>
<div nz-col [nzSpan]="4">
<div style="display: flex; justify-content: center">
@ -141,11 +143,13 @@
</div>
<div nz-row>
<div nz-col [nzSpan]="4"></div>
<div style="display: flex; justify-content: center;">
<button nz-button nzType="primary" (click)="addEndInfo()">
<i nz-icon nzType="plus"></i>
添加卸货地
</button>
</div>
</div>
</div>
</div>
<div nz-row [nzGutter]="24" style="margin-top: 24px">

14
src/app/routes/supply-management/components/release-publish/release-publish.component.ts
View File

@ -333,7 +333,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
placeholder: '请输入'
}
},
maxWeight: {
carModel: {
type: 'string',
title: '车型/车长',
ui: {
@ -344,7 +344,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
errors: { required: '请选择车型' }
}
},
maxCube: {
carLength: {
type: 'string',
title: '',
ui: {
@ -356,7 +356,7 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
}
}
},
required: ['weight', 'maxWeight', 'maxCube']
required: ['weight', 'carModel', 'carLength']
};
this.ui4 = {
'*': {
@ -372,10 +372,10 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
$number: {
grid: { span: 8 }
},
$maxWeight: {
$carModel: {
grid: { span: 12 }
},
$maxCube: {
$carLength: {
grid: { span: 12 }
}
};
@ -781,8 +781,8 @@ export class SupplyManagementReleasePublishComponent implements OnInit {
{
...this.sf4.value,
...this.sf3.value,
maxWeight: this.sf4.value.maxWeight.join(','),
maxCube: this.sf4.value.maxCube.join(',')
carModel: this.sf4.value.carModel.join(','),
carLength: this.sf4.value.carLength.join(',')
}
];
// 运费信息

2
src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html
View File

@ -74,7 +74,7 @@
{{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件
</sv>
<sv label="用车需求">
{{i?.goodsInfos?.[0]?.maxWeightLabel}}/{{i?.goodsInfos?.[0]?.maxCube}}
{{i?.goodsInfos?.[0]?.carModelLabel}}/{{i?.goodsInfos?.[0]?.carLength}}
</sv>
<sv label="承运司机">
{{i?.driver?.name}}/{{i?.driver?.phone}}

2
src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -74,7 +74,7 @@
{{i?.goodsInfos?.[0]?.weight}}吨,{{i?.goodsInfos?.[0]?.volume}}方,{{i?.goodsInfos?.[0]?.number}}件
</sv>
<sv label="用车需求">
{{i?.goodsInfos?.[0]?.maxWeightLabel}}/{{i?.goodsInfos?.[0]?.maxCube}}
{{i?.goodsInfos?.[0]?.carModelLabel}}/{{i?.goodsInfos?.[0]?.carLength}}
</sv>
<sv label="承运司机">
{{i?.driverVo?.name}}/{{i?.driverVo?.phone}}