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:
wangshiming
2022-04-29 15:08:47 +08:00
parent 17904dcf6c 11af021292
commit f84b034f43
7 changed files with 7 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less
View File

@ -32,38 +32,5 @@
padding-right: 100px;
}
.handling-info {
min-height: 90px;
border: 1px solid #ccc;
.loading-row {
display: flex;
}
.handling-info-icon {
width: 32px;
height: 32px;
margin-right: 24px;
color: #fff;
line-height: 32px;
text-align: center;
border-radius: 50%;
&.loading-bg {
background-color: #50D4AB;
}
&.unloaing-bg {
background: #F66F6A;
}
}
.info {
flex: 1;
}
.time-info {
margin-left: 56px;
}
}
}

5
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -194,7 +194,8 @@
<a class="sign"></a>
<span>运费信息</span>
</div>
<st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"
[size]="'small'">
<ng-template st-row="price" let-item let-index="index">
{{ item.price | currency }}
</ng-template>
@ -228,7 +229,7 @@
<a *ngIf="i?.supplementContent?.contractContent" (click)="agreement('2')">补充协议</a>
</sv>
</sv-container>
<sv-container col="2" class="mt-xs" layout="vertical">
<sv-container col="2" class="mt-md" layout="vertical">
<sv label="装货凭证">
<app-imagelist *ngIf="i?.loadingLadingBillFilePath|| i?.loadingPeopleVehiclesGoodsFilePath"
[imgList]="[i?.loadingLadingBillFilePath, i?.loadingPeopleVehiclesGoodsFilePath]"

37
src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less
View File

@ -36,44 +36,7 @@
display: none;
}
.handling-col {
min-height: 90px;
.handling-info {
height: 100%;
border: 1px solid #ccc;
.loading-row {
display: flex;
}
.handling-info-icon {
width: 32px;
height: 32px;
margin-right: 24px;
color: #fff;
line-height: 32px;
text-align: center;
border-radius: 50%;
&.loading-bg {
background-color: #50D4AB;
}
&.unloaing-bg {
background: #F66F6A;
}
}
}
.info {
flex: 1;
}
.time-info {
margin-left: 56px;
}
}
.target-fix {
display: block;

34
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less
View File

@ -47,38 +47,4 @@
}
}
.handling-info {
min-height: 90px;
border: 1px solid #ccc;
.loading-row {
display: flex;
}
.handling-info-icon {
width: 32px;
height: 32px;
margin-right: 24px;
color: #fff;
line-height: 32px;
text-align: center;
border-radius: 50%;
&.loading-bg {
background-color: #50D4AB;
}
&.unloaing-bg {
background: #F66F6A;
}
}
.info {
flex: 1;
}
.time-info {
margin-left: 56px;
}
}
}

35
src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less
View File

@ -47,39 +47,4 @@
}
}
.handling-info {
min-height: 100px;
border: 1px solid #ccc;
.loading-row {
display: flex;
}
.handling-info-icon {
width: 32px;
height: 32px;
margin-right: 24px;
color: #fff;
line-height: 32px;
text-align: center;
border-radius: 50%;
&.loading-bg {
background-color: #50D4AB;
}
&.unloaing-bg {
background: #F66F6A;
}
}
.info {
flex: 1;
}
.time-info {
margin-left: 56px;
margin-bottom: 0;
}
}
}

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

@ -179,8 +179,9 @@
<span>运费信息</span>
<span class="pl-sm text-warning">（到货后{{i?.paymentDays}}天内支付运费）</span>
</div>
<st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }">
<ng-template st-row="price" let-item let-index="index" [size]="'small'">
<st #st [data]="billExpenses" [columns]="logColumns" [ps]="0" [page]="{ show: false, showSize: false }"
[size]="'small'">
<ng-template st-row="price" let-item let-index="index">
{{ item.price | currency }}
</ng-template>
<ng-template st-row="prices" let-item let-index="index">