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

fix bug

Browse Source
This commit is contained in:
wangshiming
2021-12-15 20:24:24 +08:00
parent 7f65ee67ec
commit 3ba6d074cb
11 changed files with 294 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -591,7 +591,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
this.sf1data.id = res?.id;
}
res?.unLoadingPlaceVOList.forEach((element: any) => {
if(element.type === 1) {
if(element.type === 1 || element.type === '1') {
const controlId = this.startInfo.length;
if(this.PageStatus === '大宗修改') {
this.startInfo.push({
@ -626,7 +626,7 @@ export class SupplyManagementBulkPublishComponent implements OnInit {
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) {
} else if(element.type === 2 || element.type === '2') {
const controlId = this.endInfo.length;
if( this.PageStatus === '大宗修改') {
this.endInfo.push({

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

@ -35,7 +35,7 @@
><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff" (click)="openMap('start', idx)"></i
></span>
<span
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)">X</i
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subStartInfo($event, idx, data.id)"></i
></span>
</div>
</nz-form-control>
@ -77,7 +77,7 @@
</nz-input-group>
<span style="padding: 0 10px"><i nz-icon nzType="menu" nzTheme="outline" style="color: #1890ff"></i></span>
<span
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)">X</i
><i nz-icon nzType="minus-circle-o" nzTheme="fill" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
></span>
</div>
</nz-form-control>

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

@ -694,25 +694,25 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
nzWidth: 900,
nzOnOk: item => {
const poi = item.poi;
const locList = poi.location.toString().split(',');
const locList = poi.pois;
switch (type) {
case 'start':
this.startInfo[index].detailedAddress = poi.district + poi.name;
this.startInfo[index].detailedAddress = poi.formattedAddress;
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;
this.startInfo[index].address = poi.name;
this.startInfo[index].province = poi.addressComponent.province;
this.startInfo[index].city = poi.addressComponent.city;
this.startInfo[index].area = poi.addressComponent.district;
this.startInfo[index].address = poi.formattedAddress;
break;
case 'end':
this.endInfo[index].detailedAddress = poi.district + poi.name;
this.endInfo[index].detailedAddress = poi.formattedAddress;
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;
this.endInfo[index].address = poi.name;
this.endInfo[index].province = poi.addressComponent.province;
this.endInfo[index].city = poi.addressComponent.city;
this.endInfo[index].area = poi.addressComponent.district;
this.endInfo[index].address = poi.formattedAddress;
break;
default:
break;
@ -753,7 +753,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
this.sf1data.id = res?.id;
}
res?.unLoadingPlaceVOList.forEach((element: any) => {
if(element.type === 1) {
if(element.type === 1 || element.type === '1') {
const controlId = this.startInfo.length;
if(this.PageStatus === '整车修改') {
this.startInfo.push({
@ -785,7 +785,7 @@ export class SupplyManagementOnecarPublishComponent implements OnInit {
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) {
} else if(element.type === 2 || element.type === '2') {
const controlId = this.endInfo.length;
if(this.PageStatus === '整车修改') {
this.endInfo.push({