diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html index fb4c2eb6..b9bbbe97 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.html @@ -13,9 +13,25 @@
网络货运人:{{ i?.shipperAppUserName }}
- - - + + +
@@ -44,14 +60,16 @@ nzIcon="solution" [nzDescription]="i?.createAt" nzTitle="下单" + [nzSubtitle]="i?.createTime" > - + +
diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html index f03c553c..f819e340 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.html @@ -7,31 +7,55 @@
- +

货源编码 : {{ i?.resourceCode }}

-
网络货运人:{{i?.enterpriseInfoName}}
+
网络货运人:{{ i?.enterpriseInfoName }}
- - - - + + + +
- 总费用:{{i?.totalAmount | currency: '¥'}} + 总费用:{{ i?.totalAmount | currency: '¥' }}
{{ i?.externalResourceCode }} - {{i?.enterpriseProjectName}} - {{i?.createUserName}}/{{i?.createUserPhone}} - {{i?.dispatchName}}/{{i?.dispatchPhone}} - {{i?.serviceTypeLabel}} + {{ i?.enterpriseProjectName }} + {{ i?.createUserName }}/{{ i?.createUserPhone }} + {{ i?.dispatchName }}/{{ i?.dispatchPhone }} + {{ i?.serviceTypeLabel }}
@@ -39,46 +63,61 @@
- - - + + +
- 货物信息 - {{item.goodsName}} - - - {{item.weight}}吨,{{item.volume}}方,{{item.number}}件 + {{ item.goodsName }} + {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 承运信息 - {{i?.carrierInformationVO?.driverName}} + {{ i?.carrierInformationVO?.driverName }} - {{i?.carrierInformationVO?.driverTelephone}} + {{ i?.carrierInformationVO?.driverTelephone }} - {{i?.carrierInformationVO?.driverLicensePlate}} + {{ i?.carrierInformationVO?.driverLicensePlate }}
-

装货卸货信息 - ( - - +

装货卸货信息 + ( + + )

@@ -89,12 +128,12 @@
-

装货地:{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}

-

联系人:{{item?.appUserName}}/{{item?.contractTelephone}}

+

装货地:{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

+

联系人:{{ item?.appUserName }}/{{ item?.contractTelephone }}

-

装货时间:{{i?.loadingTime}}

+

装货时间:{{ i?.loadingTime }}

@@ -103,12 +142,12 @@
-

卸货地:{{item?.province}}{{item?.city}}{{item?.area}}{{item?.detailedAddress}}

-

联系人:{{item?.appUserName}}/{{item?.contractTelephone}}

+

卸货地:{{ item?.province }}{{ item?.city }}{{ item?.area }}{{ item?.detailedAddress }}

+

联系人:{{ item?.appUserName }}/{{ item?.contractTelephone }}

-

卸货时间:{{i?.unloadingTime}}

+

卸货时间:{{ i?.unloadingTime }}

@@ -118,27 +157,25 @@ - {{i?.insuranceTypeLabel}} + {{ i?.insuranceTypeLabel }} - {{i?.goodsValue |currency}} - - - {{i?.insurancePremium |currency}} 元 + {{ i?.goodsValue | currency }} + {{ i?.insurancePremium | currency }} 元 - - + +
- {{item?.totalAmount | currency}} + {{ item?.totalAmount | currency }} (含附加费)
- {{item?.price | currency}} + {{ item?.price | currency }}
@@ -147,9 +184,9 @@

- {{(i?.totalAmount) | currency}} + {{ i?.totalAmount | currency }} - (运费{{i?.totalFreight | currency}}含附加运费 {{i?.totalSurcharge| currency}}) + (运费{{ i?.totalFreight | currency }}含附加运费 {{ i?.totalSurcharge | currency }})

收款人:{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeCardNo }}
@@ -158,24 +195,23 @@ - {{i?.supplementaryInformationVO?.stateReceipt?'是':'否'}} + {{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} {{ i?.supplementaryInformationVO?.receiptType === '1' ? '电子回单' : '纸质回单' }} - {{i?.supplementaryInformationVO?.area}} + {{ i?.supplementaryInformationVO?.area }} - {{i?.supplementaryInformationVO?.address}} + {{ i?.supplementaryInformationVO?.address }} - {{i?.supplementaryInformationVO?.remarks}} + {{ i?.supplementaryInformationVO?.remarks }} - - +