解决冲突
This commit is contained in:
		| @ -38,9 +38,12 @@ | ||||
|                     placeholder="请输入装货地" | ||||
|                   /> | ||||
|                 </nz-input-group> | ||||
|                 <span style="padding: 0 10px" | ||||
|                 <span *ngIf="idx !== 0" style="padding: 0 10px" | ||||
|                   ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i | ||||
|                 ></span> | ||||
|                 <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px" | ||||
|                 ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i | ||||
|               ></span> | ||||
|               </div> | ||||
|             </nz-form-control> | ||||
|           </nz-form-item> | ||||
| @ -103,9 +106,12 @@ | ||||
|                     name="unloadAddress{{ idx }}" | ||||
|                   /> | ||||
|                 </nz-input-group> | ||||
|                 <span style="padding: 0 10px" | ||||
|                 <span *ngIf="idx !== 0" style="padding: 0 10px" | ||||
|                   ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i | ||||
|                 ></span> | ||||
|                 <span *ngIf="idx == 0" style="visibility:hidden;padding: 0 10px" | ||||
|                 ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i | ||||
|               ></span> | ||||
|               </div> | ||||
|             </nz-form-control> | ||||
|           </nz-form-item> | ||||
|  | ||||
		Reference in New Issue
	
	Block a user