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

Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

Browse Source
This commit is contained in:
Taric Xin
2022-02-25 15:08:35 +08:00
parent 30b24c2e7a a6c2aa38c4
commit 5830166b7b
4 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,6 +328,8 @@ export class SupplyManagementBulkComponent implements OnInit {
click: (_record) => this.nextOrder(_record), click: (_record) => this.nextOrder(_record),
acl: { ability: ['SUPPLY-INDEX-bulkPlaceOrder'] }, acl: { ability: ['SUPPLY-INDEX-bulkPlaceOrder'] },
}, },
{type: 'divider'},
], ],
}, },
]; ];

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

@ -38,9 +38,12 @@
placeholder="请输入装货地" placeholder="请输入装货地"
/> />
</nz-input-group> </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 ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subStartInfo($event, idx)"></i
></span> ></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> </div>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
@ -103,9 +106,12 @@
name="unloadAddress{{ idx }}" name="unloadAddress{{ idx }}"
/> />
</nz-input-group> </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 ><i nz-icon nzType="minus-circle" nzTheme="outline" style="color: #d9001b" (click)="subEndInfo($event, idx)"></i
></span> ></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> </div>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>

1
src/app/routes/supply-management/components/vehicle/vehicle.component.ts
View File

@ -597,6 +597,7 @@ export class SupplyManagementVehicleComponent implements OnInit {
click: _record => this.nextOrder(_record), click: _record => this.nextOrder(_record),
acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] } acl: { ability: ['SUPPLY-INDEX-vehiclePlaceOrder'] }
}, },
{type: 'divider'},
{ {
text: '重新指派　', text: '重新指派　',
click: _record => this.assignedCar(_record), click: _record => this.assignedCar(_record),

4
src/app/shared/components/insurance-table/insurance-table.component.html
View File

@ -4,7 +4,7 @@
* @Author : Shiming * @Author : Shiming
* @Date : 2022-01-25 20:18:52 * @Date : 2022-01-25 20:18:52
* @LastEditors : Shiming * @LastEditors : Shiming
* @LastEditTime : 2022-02-25 10:29:05 * @LastEditTime : 2022-02-25 14:04:01
* @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.component.html * @FilePath : \\tms-obc-web\\src\\app\\shared\\components\\insurance-table\\insurance-table.component.html
* Copyright (C) 2022 huzhenhong. All rights reserved. * Copyright (C) 2022 huzhenhong. All rights reserved.
--> -->
@ -18,7 +18,7 @@
<sf #sf [schema]="schema" [formData]="sfdata" [button]="'none'" [ui]="ui"> <sf #sf [schema]="schema" [formData]="sfdata" [button]="'none'" [ui]="ui">
<ng-template sf-template="freightPrice" let-i let-ui="ui"> <ng-template sf-template="freightPrice" let-i let-ui="ui">
<nz-input-group [nzAddOnAfter]="addOnAfterTemplate"> <nz-input-group [nzAddOnAfter]="addOnAfterTemplate">
<nz-input-number [(ngModel)]="minInsurancePrice" [nzMin]="0" style="width: 100%"></nz-input-number> <nz-input-number [(ngModel)]="minInsurancePrice" [nzMin]="0" ></nz-input-number>
</nz-input-group> </nz-input-group>
<ng-template #addOnAfterTemplate> <ng-template #addOnAfterTemplate>
<span >元</span> <span >元</span>