fix bug
This commit is contained in:
wangshiming
@ -14,6 +14,7 @@ import { AmapPoiPickerComponent } from '@shared';
|
||||
import { NzModalService } from 'ng-zorro-antd/modal';
|
||||
import { PublishGoodsChooseFamifiarComponent } from '../choose-famifiar/choose-famifiar.component';
|
||||
import { SupplyManagementService } from '../../services/supply-management.service';
|
||||
import { debug } from 'console';
|
||||
@Component({
|
||||
selector: 'app-publish-goods-onecar-publish',
|
||||
templateUrl: './onecar-publish.component.html',
|
||||
@ -29,8 +30,10 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
sf6data: any; // 货源单设置回显
|
||||
sf7data: any; // 货源单设置回显
|
||||
creatTime: any; // 货源单设置回显
|
||||
modifyTime: any; // 货源单设置回显
|
||||
loadingTime: any; // 货源单设置回显
|
||||
unloadingTime: any; // 货源单设置回显
|
||||
totalFees: any; // 总数信息
|
||||
npp =false
|
||||
id = this.route.snapshot.params.id;
|
||||
// // 单位
|
||||
unit1 = '吨';
|
||||
@ -42,8 +45,8 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
dataList: any;
|
||||
constructor(private http: _HttpClient, fb: FormBuilder, private router: Router, private route: ActivatedRoute, private modalService: NzModalService, public service: SupplyManagementService) {
|
||||
this.validateForm1 = fb.group({
|
||||
createTime: [null, []],
|
||||
modifyTime: [null, []],
|
||||
loadingTime: [null, []],
|
||||
unloadingTime: [null, []],
|
||||
});
|
||||
}
|
||||
@ViewChild('sf1', { static: false }) sf1!: SFComponent;
|
||||
@ -97,15 +100,15 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
initSF1() {
|
||||
this.schema1 = {
|
||||
properties: {
|
||||
// shipperAppUserName: {
|
||||
// type: 'string',
|
||||
// title: '货主',
|
||||
// maxLength: 30,
|
||||
// ui: {
|
||||
// placeholder: '请输入'
|
||||
// }
|
||||
// },
|
||||
enterpriseProjectName: {
|
||||
shipperAppUserName: {
|
||||
type: 'string',
|
||||
title: '货主',
|
||||
maxLength: 30,
|
||||
ui: {
|
||||
placeholder: '请输入'
|
||||
}
|
||||
},
|
||||
enterpriseProjectId: {
|
||||
type: 'string',
|
||||
title: '项目',
|
||||
enum: [
|
||||
@ -464,7 +467,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
console.log(this.totalFees)
|
||||
}
|
||||
initSF7() {
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '整车下一单') {
|
||||
this.schema7 = {
|
||||
properties: {
|
||||
prePay: { type: 'number', title: '预付', default: 0, ui: { prefix: '￥', change: ()=> {
|
||||
@ -516,20 +518,6 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
},
|
||||
required: ['paymentDays']
|
||||
};
|
||||
} else {
|
||||
this.schema7 = {
|
||||
properties: {
|
||||
totalFee: {
|
||||
type: 'string',
|
||||
title: '总费用',
|
||||
ui: {
|
||||
widget: 'custom',
|
||||
placeholder: '请输入'
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
this.ui7 = {
|
||||
'*': {
|
||||
spanLabelFixed: 90,
|
||||
@ -611,76 +599,96 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
});
|
||||
}
|
||||
submit(): void {
|
||||
Object.keys(this.validateForm1.controls).forEach(key => {
|
||||
this.validateForm1.controls[key].markAsDirty();
|
||||
this.validateForm1.controls[key].updateValueAndValidity();
|
||||
});
|
||||
if(typeof(this.validateForm1.value.modifyTime) !== 'string' ) {
|
||||
var c = new Date(this.validateForm1.value.modifyTime);
|
||||
this.validateForm1.value.modifyTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds()
|
||||
console.log('进来了')
|
||||
console.log(this.startInfo)
|
||||
// Object.keys(this.validateForm1.controls).forEach(key => {
|
||||
// this.validateForm1.controls[key].markAsDirty();
|
||||
// this.validateForm1.controls[key].updateValueAndValidity();
|
||||
// });
|
||||
// this.sf1.validator({ emitError: true });
|
||||
// this.sf3.validator({ emitError: true });
|
||||
// this.sf4.validator({ emitError: true });
|
||||
// this.sf6.validator({ emitError: true });
|
||||
// if (this.validateForm1.invalid || !this.sf1.valid || !this.sf3.valid || !this.sf4.valid || !this.sf6.valid) {
|
||||
// return;
|
||||
// }
|
||||
console.log(this.validateForm1.value)
|
||||
if(typeof(this.validateForm1.value.unloadingTime) !== 'string' ) {
|
||||
var c = new Date(this.validateForm1.value.unloadingTime);
|
||||
this.validateForm1.value.unloadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
|
||||
}
|
||||
if(typeof(this.validateForm1.value.createTime) !== 'string' ) {
|
||||
var c = new Date(this.validateForm1.value.createTime);
|
||||
this.validateForm1.value.createTime = c.getFullYear() + '-' + (c.getMonth() + 1) + '-' + c.getDate() + ' ' + c.getHours() + ':' + c.getMinutes() + ':' + c.getSeconds()
|
||||
if(typeof(this.validateForm1.value.loadingTime) !== 'string' ) {
|
||||
var c = new Date(this.validateForm1.value.loadingTime);
|
||||
this.validateForm1.value.loadingTime = c.getFullYear() + '-' + this.addPreZero(c.getMonth() + 1) + '-' + this.addPreZero(c.getDate()) + ' ' + this.addPreZero(c.getHours()) + ':' + this.addPreZero(c.getMinutes()) + ':' + this.addPreZero(c.getSeconds())
|
||||
}
|
||||
if (this.validateForm1.invalid) {
|
||||
return;
|
||||
}
|
||||
this.startInfo.createTime = this.validateForm1.value.createTime
|
||||
this.startInfo.modifyTime = this.validateForm1.value.modifyTime
|
||||
// if (this.validateForm1.invalid) {
|
||||
// return;
|
||||
// }
|
||||
const params: any = {
|
||||
...this.sf1.value,
|
||||
...this.sf5.value,
|
||||
...this.sf6.value,
|
||||
loadingTime: this.validateForm1?.value?.loadingTime,
|
||||
unloadingTime: this.validateForm1?.value?.unloadingTime,
|
||||
unLoadingPlaceDTOList: [...this.startInfo, ...this.endInfo,],
|
||||
goodsInfoDTOList: [
|
||||
{...this.sf4.value, ...this.sf3.value}
|
||||
{
|
||||
...this.sf4.value,
|
||||
...this.sf3.value,
|
||||
maxWeight: this.sf4.value.maxWeight.join(','),
|
||||
maxCube: this.sf4.value.maxCube.join(',')
|
||||
}
|
||||
]
|
||||
}
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '整车下一单') {
|
||||
params.shippingInformationDTO = {
|
||||
...this.sf7.value,
|
||||
totalFees: this.totalFees
|
||||
}
|
||||
} else {
|
||||
params.freightPrice = this.totalFees
|
||||
}
|
||||
console.log(this.sf7.value)
|
||||
console.log(params)
|
||||
if(this.PageStatus === '整车修改') {
|
||||
this.requests(this.service.$api_set_WholeModify, params);
|
||||
} else if(this.PageStatus === '整车下一单') {
|
||||
this.requests(this.service.$api_set_saveAnotherWholeOrder, params);
|
||||
} else if(this.PageStatus === '大宗修改') {
|
||||
this.requests(this.service.$api_set_bulkModify, params);
|
||||
} else if(this.PageStatus === '大宗下一单') {
|
||||
this.requests(this.service.$api_set_saveAnotherBulkOrder, params);
|
||||
}
|
||||
|
||||
}
|
||||
addPreZero(num: any){
|
||||
if(num<10){
|
||||
return '0'+num;
|
||||
} else {
|
||||
return num;
|
||||
}
|
||||
}
|
||||
requests(url: any, params: any) {
|
||||
this.service.request(url, params).subscribe((res: any) => {
|
||||
console.log(res)
|
||||
})
|
||||
}
|
||||
openMap(type: string, index: number) {
|
||||
// 打开地图
|
||||
openMap(type: string, index: number) {
|
||||
const modalRef = this.modalService.create({
|
||||
nzTitle: '',
|
||||
nzContent: AmapPoiPickerComponent,
|
||||
nzWidth: 900,
|
||||
nzOnOk: item => {
|
||||
const poi = item.poi;
|
||||
console.log(item)
|
||||
console.log(item.poi);
|
||||
const locList = poi.location.toString().split(',');
|
||||
switch (type) {
|
||||
case 'start':
|
||||
this.startInfo[index].detailedAddress = poi.district + poi.name;
|
||||
this.startInfo[index].longitude = locList[0];
|
||||
this.startInfo[index].latitude = locList[1];
|
||||
this.startInfo[index].province = poi.cityInfo.province;
|
||||
this.startInfo[index].city = poi.cityInfo.city;
|
||||
this.startInfo[index].area = poi.cityInfo.district;
|
||||
break;
|
||||
case 'end':
|
||||
this.endInfo[index].detailedAddress = poi.district + poi.name;
|
||||
this.endInfo[index].longitude = locList[0];
|
||||
this.endInfo[index].latitude = locList[1];
|
||||
this.endInfo[index].province = poi.cityInfo.province;
|
||||
this.endInfo[index].city = poi.cityInfo.city;
|
||||
this.endInfo[index].area = poi.cityInfo.district;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
@ -693,15 +701,9 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
}
|
||||
// 初始化信息
|
||||
initdata() {
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '整车下一单') {
|
||||
this.service.request(`${this.service.$api_get_getCompleteVehicleDetail}`, {id:this.id}).subscribe((res) => {
|
||||
this.dataR(res);
|
||||
})
|
||||
} else if(this.PageStatus === '大宗修改' || this.PageStatus === '大宗下一单') {
|
||||
this.service.request(`${this.service.$api_get_getBulkDetail}`, {id:this.id}).subscribe((res) => {
|
||||
this.dataR(res);
|
||||
})
|
||||
}
|
||||
}
|
||||
asds(i: any) {
|
||||
console.log(i)
|
||||
@ -710,19 +712,19 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
dataR (res: any) {
|
||||
// this.dataList = res;
|
||||
this.sf1data = {
|
||||
// shipperAppUserName: res?.shipperAppUserName || '',
|
||||
enterpriseProjectName: res?.enterpriseProjectName || '',
|
||||
enterpriseInfoName: res?.enterpriseInfoName || '',
|
||||
externalResourceCode: res?.externalResourceCode || '',
|
||||
dispatchId: res?.dispatchId || '',
|
||||
// shipperAppUserName: res?.shipperAppUserName ,
|
||||
enterpriseProjectId: res?.enterpriseProjectId ,
|
||||
enterpriseInfoName: res?.enterpriseInfoName ,
|
||||
externalResourceCode: res?.externalResourceCode ,
|
||||
dispatchId: res?.dispatchId ,
|
||||
}
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
|
||||
if(this.PageStatus === '整车修改') {
|
||||
this.sf1data.id = res?.id;
|
||||
}
|
||||
res?.unLoadingPlaceList.forEach((element: any) => {
|
||||
res?.unLoadingPlaceVOList.forEach((element: any) => {
|
||||
if(element.type === 1) {
|
||||
const controlId = this.startInfo.length;
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
|
||||
if(this.PageStatus === '整车修改') {
|
||||
this.startInfo.push({
|
||||
detailedAddress: element.detailedAddress,
|
||||
appUserName: element.appUserName,
|
||||
@ -748,16 +750,13 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
type: element.type,
|
||||
})
|
||||
}
|
||||
if(element.createTime) {
|
||||
this.creatTime = element?.createTime
|
||||
this.modifyTime = element?.modifyTime
|
||||
}
|
||||
|
||||
this.validateForm1.addControl(`loadAddress${controlId}`, new FormControl(null, Validators.required));
|
||||
this.validateForm1.addControl(`loadName${controlId}`, new FormControl(null, Validators.required));
|
||||
this.validateForm1.addControl(`loadPhone${controlId}`, new FormControl(null, Validators.required));
|
||||
} else if(element.type === 2) {
|
||||
const controlId = this.endInfo.length;
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
|
||||
if(this.PageStatus === '整车修改') {
|
||||
this.endInfo.push({
|
||||
detailedAddress: element?.detailedAddress,
|
||||
appUserName: element?.appUserName,
|
||||
@ -788,52 +787,51 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
|
||||
this.validateForm1.addControl(`unloadPhone${controlId}`, new FormControl(null, Validators.required));
|
||||
}
|
||||
});
|
||||
|
||||
this.sf3data = {
|
||||
goodsName: res?.goodsInfoList[0]?.goodsName || '',
|
||||
goodsName: res?.goodsInfoVOList[0]?.goodsName ,
|
||||
}
|
||||
this.sf4data = {
|
||||
weight: res?.goodsInfoList[0]?.weight || '',
|
||||
volume: res?.goodsInfoList[0]?.volume || '',
|
||||
vehicleDemand: res?.goodsInfoList[0]?.vehicleDemand || '',
|
||||
maxCube: res?.goodsInfoList[0]?.maxCube?.split(',') || '',
|
||||
maxWeight: res?.goodsInfoList[0]?.maxWeight?.split(',') || '',
|
||||
number: res?.goodsInfoList[0]?.number || '',
|
||||
freightPrice: res?.goodsInfoList[0]?.freightPrice || '',
|
||||
freightType: res?.goodsInfoList[0]?.freightType || '',
|
||||
goodsType: res?.goodsInfoList[0]?.goodsType || '',
|
||||
modifyTime: res?.goodsInfoList[0]?.modifyTime || '',
|
||||
modifyUserId: res?.goodsInfoList[0]?.modifyUserId || '',
|
||||
resourceId: res?.goodsInfoList[0]?.resourceId || '',
|
||||
rule: res?.goodsInfoList[0]?.rule || '',
|
||||
settlementBasis: res?.goodsInfoList[0]?.settlementBasis || '',
|
||||
|
||||
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(',') ,
|
||||
number: res?.goodsInfoVOList[0]?.number ,
|
||||
goodsType: res?.goodsInfoVOList[0]?.goodsType ,
|
||||
modifyUserId: res?.goodsInfoVOList[0]?.modifyUserId ,
|
||||
resourceId: res?.goodsInfoVOList[0]?.resourceId ,
|
||||
rule: res?.goodsInfoVOList[0]?.rule ,
|
||||
settlementBasis: res?.goodsInfoVOList[0]?.settlementBasis ,
|
||||
}
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
|
||||
this.sf4data.id = res?.goodsInfoList[0]?.id;
|
||||
}
|
||||
if(this.PageStatus === '大宗下一单' || this.PageStatus === '大宗修改') {
|
||||
this.totalFees = res?.freightPrice || '0';
|
||||
} else {
|
||||
this.totalFees = res?.shippingInformationVO?.totalFee || '0';
|
||||
if(res?.loadingTime) {
|
||||
this.loadingTime = res?.loadingTime;
|
||||
}
|
||||
if(res?.unloadingTime) {
|
||||
this.unloadingTime = res?.unloadingTime;
|
||||
}
|
||||
if(this.PageStatus === '整车修改' ) {
|
||||
this.sf4data.id = res?.goodsInfoVOList[0]?.id;
|
||||
}
|
||||
this.totalFees = res?.shippingInformationVO?.totalFee || '0';
|
||||
this.sf5data = {
|
||||
goodsValue: res?.goodsValue || '',
|
||||
goodsValue: res?.goodsValue ,
|
||||
}
|
||||
console.log(res?.stateReceipt)
|
||||
this.sf6data = {
|
||||
stateReceipt: res?.supplementaryInformationVO?.stateReceipt || '',
|
||||
remarks: res?.supplementaryInformationVO?.remarks || '',
|
||||
stateReceipt: res?.stateReceipt,
|
||||
receiptType: res?.receiptType ,
|
||||
receiptUserId: res?.receiptUserId ,
|
||||
remarks: res?.remarks
|
||||
}
|
||||
this.sf7data = {
|
||||
prePay: res?.shippingInformationVO?.prePay || '',
|
||||
toPay: res?.shippingInformationVO?.toPay || '',
|
||||
oilCardPay: res?.shippingInformationVO?.oilCardPay || '',
|
||||
receiptPay: res?.shippingInformationVO?.receiptPay || '',
|
||||
// subtotal: res?.shippingInformationVO?.oilCardPay || '',
|
||||
appendFee: res?.shippingInformationVO?.appendFee || '',
|
||||
paymentDays: res?.shippingInformationVO?.paymentDays || '',
|
||||
prePay: res?.shippingInformationVO?.prePay ,
|
||||
toPay: res?.shippingInformationVO?.toPay ,
|
||||
oilCardPay: res?.shippingInformationVO?.oilCardPay ,
|
||||
receiptPay: res?.shippingInformationVO?.receiptPay ,
|
||||
// subtotal: res?.shippingInformationVO?.oilCardPay ,
|
||||
appendFee: res?.shippingInformationVO?.appendFee ,
|
||||
paymentDays: res?.shippingInformationVO?.paymentDays ,
|
||||
}
|
||||
if(this.PageStatus === '整车修改' || this.PageStatus === '大宗修改') {
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user