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-04-28 15:36:33 +08:00
parent dc64c78694 e43a351dd6
commit d900d36e02
2 changed files with 33 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html
View File

@ -6,11 +6,19 @@
</button> </button>
</ng-template> </ng-template>
<ng-template #headerContent> <ng-template #headerContent>
<div class="mb-xs" nz-row> <div class="mb-sm common-order-header" nz-row>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button> <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4> <b class="ml-md">货源编码 : {{ i?.resourceCode }}</b>
</div> </div>
<div class="common-order-header" nz-row> <div>
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
<button nz-button (click)="updatePrice(i)" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-updatePrice']">修改单价</button>
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
</div>
<!-- <div class="common-order-header" nz-row>
<div class="common-grey">网络货运人：{{ i?.shipperAppUserName }}</div> <div class="common-grey">网络货运人：{{ i?.shipperAppUserName }}</div>
<div> <div>
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
@ -20,7 +28,7 @@
<button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl <button nz-button nzType="primary" nzGhost (click)="placeOrder(i)" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button> [acl-ability]="['SUPPLY-BULK-DETAIL-bulkAnotherOrder']">再下一单</button>
</div> </div>
</div> </div> -->
<!-- <div class="mt-sm mb-sm" nz-row> <!-- <div class="mt-sm mb-sm" nz-row>
<div> <div>
<b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b> <b>总费用：<span class="text-red-light text-md">{{ i?.totalAmount | currency: '¥' }}</span></b>
@ -28,6 +36,7 @@
</div> --> </div> -->
<nz-divider></nz-divider> <nz-divider></nz-divider>
<div sv-container> <div sv-container>
<sv label="网络货运人">{{ i?.shipperAppUserName }}</sv>
<sv label="项目">{{ i?.enterpriseProjectName }}</sv> <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
<sv label="截止时间">{{ i?.deadlineTime }}</sv> <sv label="截止时间">{{ i?.deadlineTime }}</sv>
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv> <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
@ -37,12 +46,11 @@
</ng-template> </ng-template>
</page-header-wrapper> </page-header-wrapper>
<nz-card [nzBorderless]="true" class="mb0"> <nz-card [nzBorderless]="true" class="mb0">
<div class="mb-xs" nz-row> <div class="mb-sm common-order-header" nz-row>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button> <div>
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4> <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
</div> <b class="ml-md">货源编码 : {{ i?.resourceCode }}</b>
<div class="common-order-header" nz-row> </div>
<div class="common-grey">网络货运人：{{ i?.shipperAppUserName }}</div>
<div> <div>
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button> [acl-ability]="['SUPPLY-BULK-DETAIL-cancelSupply']">取消货源</button>
@ -59,6 +67,7 @@
</div> --> </div> -->
<nz-divider class="divider-margin"></nz-divider> <nz-divider class="divider-margin"></nz-divider>
<div class="mb-lg" sv-container> <div class="mb-lg" sv-container>
<sv label="网络货运人">{{ i?.shipperAppUserName }}</sv>
<sv label="项目">{{ i?.enterpriseProjectName }}</sv> <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
<sv label="截止时间">{{ i?.deadlineTime }}</sv> <sv label="截止时间">{{ i?.deadlineTime }}</sv>
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv> <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>
@ -174,21 +183,22 @@
<div class="font-weight-blod text-md detail-title"> <div class="font-weight-blod text-md detail-title">
<a class="sign mr-xs"></a> <a class="sign mr-xs"></a>
<span>运费信息</span> <span>运费信息</span>
<span class="pl-sm text-warning">(到货后{{i?.paymentDays}}天内支付运费)</span>
</div> </div>
<div> <div>
<div nz-row> <div nz-row>
<div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24"> <div *ngFor="let item of i?.goodsInfoVOList" nz-col nzSpan="24">
<div>
<p class="text-warning-light mb-xs text-right">收货后{{ i?.paymentDays }}天内支付运费</p>
<p class="mb-xs text-right"> {{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}</p>
</div>
<nz-divider class="mb-xs mt-xs"></nz-divider>
<div class="text-right"> <div class="text-right">
<label>运费单价：</label> <label>运费单价：</label>
<span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{ <span class="text-error-dark text-xxl">{{ item?.freightPrice | currency: '￥' }} {{
freightType[item?.freightType] }}</span> freightType[item?.freightType] }}</span>
<span>（附加费率{{i?.rate * 100 | number: '0.2-2'}}%）</span> <span>（附加费率{{i?.rate * 100 | number: '0.2-2'}}%）</span>
</div> </div>
<nz-divider class="mb-xs mt-xs"></nz-divider>
<div>
<!-- <p class="text-warning-light mb-xs text-right">收货后{{ i?.paymentDays }}天内支付运费</p> -->
<p class="mb0 text-right"> {{ settlementBasis[item?.settlementBasis] }}，{{ rule[item?.rule] }}</p>
</div>
</div> </div>
</div> </div>
</div> </div>

16
src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html
View File

@ -8,13 +8,12 @@
</ng-template> </ng-template>
</page-header-wrapper> </page-header-wrapper>
<nz-card [nzBorderless]="true" class="mb0"> <nz-card [nzBorderless]="true" class="mb0">
<div class="mb-xs" nz-row> <div class="mb-sm common-order-header" nz-row>
<button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button> <div>
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4> <button nz-button nzType="primary" nzSize="small" nzDanger>{{ i?.resourceStatusLabel }}</button>
</div> <b class="ml-md">货源编码 : {{ i?.resourceCode }}</b>
<div nz-row> </div>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{ i?.enterpriseInfoName }}</div> <div>
<div nz-col nzSpan="10">
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl <button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'" acl
[acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button> [acl-ability]="['SUPPLY-VEHICLE-DETAIL-cancelSupply']">取消货源</button>
<button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl <button nz-button (click)="assignedCar(i)" *ngIf="i?.resourceStatus === '1' && i?.serviceType === '2'" acl
@ -32,7 +31,8 @@
</div> </div>
</div> --> </div> -->
<nz-divider class="divider-margin"></nz-divider> <nz-divider class="divider-margin"></nz-divider>
<div class="mb-lg" sv-container *ngIf="i"> <div class="mb-lg" sv-container>
<sv label="网络货运人">{{ i?.enterpriseInfoName }} </sv>
<sv label="外部货源号">{{ i?.externalResourceCode }} </sv> <sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
<sv label="项目">{{ i?.enterpriseProjectName }}</sv> <sv label="项目">{{ i?.enterpriseProjectName }}</sv>
<sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv> <sv label="录单员">{{ i?.createUserName }}/{{ i?.createUserPhone }}</sv>