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-01-13 20:29:27 +08:00
parent 2061944237 87453dfe12
commit 35c3135e52
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html
View File

@ -1,7 +1,7 @@
<!--
* @Author: your name
* @Date: 2021-12-03 15:31:52
* @LastEditTime: 2022-01-13 10:07:03
* @LastEditTime: 2022-01-13 19:44:00
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \tms-obc-web\src\app\routes\order-management\components\vehicle-detail\vehicle-detail.component.html
@ -143,9 +143,10 @@
</st>
<div>
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency: '￥' }}</span> （运费￥{{
totalObj?.price - attObj?.price
}}，附加运费￥{{ attObj?.price }}，附加费率{{ (attObj?.price / totalObj?.price) * 100 | number: '0.2-2' }}%）
<div>
总计：<span style="color: #da001b; font-size: 18px">{{ totalObj?.price | currency }}</span> （运费￥{{
totalObj?.price - attObj?.price | currency}}，附加费￥{{ attObj?.price | currency }}，附加费率{{i?.attPercent }}%）
</div>
</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}</div>
</nz-card>

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

@ -11,7 +11,7 @@
<h4 class="ml-md">货源编码 : {{ i?.resourceCode }}</h4>
</div>
<div nz-row>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.enterpriseInfoName}}</div>
<div nz-col nzSpan="14" class="text-grey-darker">网络货运人：{{i?.shipperAppUserName}}</div>
<div nz-col nzSpan="10">
<button nz-button (click)="cancleGoodsSource()" *ngIf="i?.resourceStatus === '1'">取消货源</button>
<button nz-button (click)="assignedCar(i)"

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

@ -28,7 +28,7 @@
<nz-divider></nz-divider>
<div sv-container *ngIf="i">
<sv label="外部货源号">{{ i?.externalResourceCode }} </sv>
<sv label="项目">{{i?.enterpriseProjectId}}</sv>
<sv label="项目">{{i?.enterpriseProjectName}}</sv>
<sv label="录单员">{{i?.createUserName}}/{{i?.createUserPhone}}</sv>
<sv label="调度员">{{i?.dispatchName}}/{{i?.dispatchPhone}} </sv>
<sv label="服务类型">{{i?.serviceTypeLabel}} </sv>
@ -146,7 +146,7 @@
</span>
<span>（运费{{i?.totalFreight | currency: '￥'}}含附加运费 {{i?.totalSurcharge| currency: '￥' }}）</span>
</h3>
<div>收款人：曹济发 / 18211579566 / 621483****6368</div>
<div>收款人：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}</div>
</div>
</div>
<!-- <div>
@ -162,7 +162,7 @@
{{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}}
</sv>
<sv label="回单类型">
{{i?.supplementaryInformationVO?.receiptTypeLabel}}
{{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }}
</sv>
<sv label="所在地区">
{{i?.supplementaryInformationVO?.area}}

2
src/app/routes/vehicle/components/audit/detail/detail.component.html
View File

@ -28,7 +28,7 @@
</div>
</sv-title>
<sv label="申请时间">
{{ detailData?.approvalPassTime }}
{{ detailData?.createTime }}
</sv>
<sv label="录入人员">
{{ detailData?.saveUser }}