diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html index 1e7e4c8f..eaf3aaae 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.html @@ -1,5 +1,5 @@ - + -
- -

订单号: {{ i?.billCode }}

-
-
+
+
+ + 订单号: {{ i?.billCode }} +
+
{{ i?.goodsResource?.enterpriseInfoName }} @@ -52,10 +53,37 @@
- + +
+
+ + 订单号: {{ i?.billCode }} +
+
+ + +
+
+ +
+ {{ i?.goodsResource?.enterpriseInfoName }} + {{ i?.goodsResource?.shipperAppUserName }} + {{ i?.goodsResource?.enterpriseProjectName }} + {{ i?.goodsResource?.serviceTypeLabel }} + {{ i?.createUserName }} {{ i?.createUserPhone ? "/" + i?.createUserPhone : ''}} + {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? "/" + + i?.goodsResource?.dispatchPhone : ''}} + {{ i?.goodsResource?.resourceCode }} + {{ i?.wayBill?.wayBillCode }} + {{ i?.goodsResource?.paymentDays }} +
+
-
-   +
@@ -64,13 +92,65 @@
- - + + + +
+ + 装货卸货信息 + ( + + ) + +
+
+
+
+ + +
+
+
装
+
+

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

+

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : '' + }}

+
+
+
+ +
+
+
+
+ +
+
+
卸
+
+

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

+

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : ''}} +

+
+
+
+ +
+
+
+ + + + +
+ + 基本信息 +
+ + {{i?.goodsInfoList?.[0]?.goodsName}} - - {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 {{ i?.carModel }}{{ i?.carLength ? "/" + i?.carLength : ''}} @@ -89,77 +169,62 @@ {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方 -
-

装货卸货信息 - ( - - - - ) -

-
-
-
-
-
-
装
-
-

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

-

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : '' }}

-
-
-
-
-
-
-
-
-
-
卸
-
-

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

-

联系人：{{ item.appUserName }}{{ item.contractTelephone ? "/" + item.contractTelephone : ''}}

-
-
-
-
-
-
-
+ - - - 运费信息到货后{{i?.goodsResource.paymentDays}}天内支付运费 - -
- {{ i?.freightPrice }}{{ i?.freightTypeLabel }} （{{ - i?.settlementBasisLabel }}，{{ - i?.ruleLabel - }}） -
- - - {{ item.price + item.surcharge | currency }} - - 到付 - {{item.price | currency}} - {{item.surcharge | currency}} - -
- 总计：{{ i?.totalAmount | currency }} （运费{{ i?.totalFreight | - currency }}， - 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%） -
-
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeIdNo }}
+ + +
+ + 运费信息 + 到货后{{i?.goodsResource.paymentDays}}天内支付运费 +
+ + + + {{ item.price + item.surcharge | currency }} + + 到付 + {{item.price | currency}} + {{item.surcharge | currency}} + + + +
+ 总计：{{ i?.totalAmount | currency }} {{ i?.freightTypeLabel }} + （运费{{ i?.totalFreight | + currency }}， + 附加费{{ i?.totalSurcharge | currency }}，附加费率{{ i?.totalRate * 100 | number: '0.2-2' }}%） + ({{ + i?.settlementBasisLabel }}，{{ + i?.ruleLabel + }}) +
+ +
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}/{{ i?.payeeIdNo }} +
- + +
+ + 附件信息 +
查看附件      @@ -177,7 +242,11 @@ - + +
+ + 补充信息 +
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} @@ -193,19 +262,17 @@ {{ i?.supplementaryInformationVO?.address }} - - - - - {{ i?.goodsResource?.remarks }} + + + - -

| 轨迹信息

+ +

| 轨迹信息

@@ -221,19 +288,19 @@
- + -
-
- 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! +
+
+ 您的订单可能存在交易风险，请及时提交申诉材料，提交成功后，平台将及时完成审核并通知您! +
+
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
+
    +
  • 系统识别:{{item?.complianceName}}
    • +
  • {{item?.determineDetails}}
    • +
-
如果您的运单没有问题，可以提出申诉，并提供相关资料，我们将24小时内审核反馈
-
    -
  • 系统识别:{{item?.complianceName}}
    • -
  • {{item?.determineDetails}}
    • -
-
--> - + @@ -263,4 +330,4 @@ - \ No newline at end of file + diff --git a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less index 1d17aeb7..2f8ec35b 100644 --- a/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/order-management/components/bulk-detail/bulk-detail.component.less @@ -1,94 +1,69 @@ :host { - .btn-size { - font-size: 14px; + .btn-size { + font-size: 14px; + } + + .bdr { + border-right: 1px solid #ccc; + } + + .bdl { + border-left: 1px solid #ccc; + } + + .source-info { + p { + margin-bottom: .5em; + } + } + + .freight-info-box { + width: 95%; + } + + .freigth-label { + display: inline-block; + width: 50px; + text-align: right; + } + + + .leftPadding { + padding-right: 100px; + } + + .handling-info { + min-height: 90px; + border: 1px solid #ccc; + + .loading-row { + display: flex; } - .bdr { - border-right: 1px solid #ccc; - } + .handling-info-icon { + width: 32px; + height: 32px; + margin-right: 24px; + color: #fff; + line-height: 32px; + text-align: center; + border-radius: 50%; - .bdl { - border-left: 1px solid #ccc; - } - - .source-info { - p { - margin-bottom: .5em; - } - } - - .freight-info-box { - width: 95%; - } - - .freigth-label { - display : inline-block; - width : 50px; - text-align: right; - } - - ::ng-deep { - .approval-status { - .ant-steps { - width : 70%; - margin: 0 auto; - } - } - - // .ant-tabs-top>.ant-tabs-nav, - // .ant-tabs-bottom>.ant-tabs-nav, - // .ant-tabs-top>div>.ant-tabs-nav, - // .ant-tabs-bottom>div>.ant-tabs-nav { - // margin: 0; - // } - - // .ant-anchor-ink::before { - // width: 0; - // } - - // .ant-tabs-card.ant-tabs-top>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - // .ant-tabs-card.ant-tabs-bottom>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - // .ant-tabs-card.ant-tabs-top>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab, - // .ant-tabs-card.ant-tabs-bottom>div>.ant-tabs-nav .ant-tabs-tab+.ant-tabs-tab { - // margin-left: 40px - // } - } - - .leftPadding { - padding-right: 100px; - } - .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; - } + &.loading-bg { + background-color: #50D4AB; } -} \ No newline at end of file + + &.unloaing-bg { + background: #F66F6A; + } + } + + .info { + flex: 1; + } + + .time-info { + margin-left: 56px; + } + } +} diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html index 1da90e5c..43781ffc 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.html @@ -1,5 +1,5 @@ - + -
- -

订单号: {{ i?.billCode }}

-
-
-
+
+
+ + 订单号: {{ i?.billCode }} +
+
@@ -55,9 +55,40 @@
- + +
+
+ + 订单号: {{ i?.billCode }} +
+
+ + +
+
+ +
+
+ {{ i?.goodsResource?.enterpriseInfoName }} + {{ i?.goodsResource?.shipperAppUserName }} + {{ i?.goodsResource?.enterpriseProjectName }} + {{ i?.goodsResource?.serviceTypeLabel }} + {{ i?.createUserName }} {{ i?.createUserPhone ? '/' + i?.createUserPhone : '' }} + {{ i?.goodsResource?.dispatchName }}{{ i?.goodsResource?.dispatchPhone ? '/' + + i?.goodsResource?.dispatchPhone : '' }} + + {{ i?.externalBillCode }} + {{ i?.goodsResource?.resourceCode }} + {{ i?.wayBill?.wayBillCode }} + {{ i?.goodsResource?.paymentDays }} +
+
-
+
- - - - 货物信息 - - {{ i?.goodsResource?.enterpriseInfoName }} - - - {{i?.goodsInfoList?.[0]?.goodsName}} - - - - - {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 - {{ i?.carModel }}{{ i?.carLength ? '/' + i?.carLength : '' }} - {{ i?.driverName }}{{ i?.driverPhone ? '/' + i?.driverPhone : '' }}{{ i?.carNo ? '/' + i?.carNo : - '' }} - {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 - -
-

装货卸货信息 + + +
+ + 装货卸货信息 + ( + + + ) + +
+
+
+
+ +
+
装

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

@@ -105,11 +127,13 @@
-

计划装货时间：{{ i?.goodsResource?.loadingTime }}

-
+ +

计划装货时间：{{ i?.goodsResource?.loadingTime }}

-
-
+
+
+
+
卸
@@ -119,13 +143,39 @@
-

计划卸货时间：{{ i?.goodsResource?.unloadingTime }}

-
+ +

计划卸货时间：{{ i?.goodsResource?.unloadingTime }}

 - + +
+ + 基本信息 +
+ + + + {{ i?.goodsResource?.enterpriseInfoName }} + + + {{i?.goodsInfoList?.[0]?.goodsName}} + + + {{i?.goodsInfoList?.[0]?.weight}}吨,{{i?.goodsInfoList?.[0]?.volume}}方,{{i?.goodsInfoList?.[0]?.number}}件 + {{ i?.carModel }}{{ i?.carLength ? '/' + i?.carLength : '' }} + {{ i?.driverName }}{{ i?.driverPhone ? '/' + i?.driverPhone : '' }}{{ i?.carNo ? '/' + i?.carNo : + '' }} + {{ i?.driverCarModelLabel }},{{ i?.driverCarLengthLabel }}米,{{ i?.driverCarWeight }}吨 + + + + +
+ + 服务信息 +
{{ i?.goodsResource?.insuranceTypeLabel }} @@ -139,7 +189,11 @@ - + +
+ + 运费信息 +
{{ item.price | currency }} @@ -160,7 +214,11 @@ i?.payeePhone : '' }}/{{ i?.payeeIdNo }}
- + +
+ + 附件信息 +
查看附件      @@ -177,7 +235,11 @@ - + +
+ + 补充信息 +
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} @@ -205,7 +267,7 @@ - +

| 轨迹信息

@@ -222,7 +284,7 @@
- +
@@ -262,4 +324,4 @@ - \ No newline at end of file + diff --git a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less index 64f5143e..523f1555 100644 --- a/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less +++ b/src/app/routes/order-management/components/vehicle-detail/vehicle-detail.component.less @@ -1,84 +1,82 @@ :host { - .btn-size { - font-size: 14px; - } + .btn-size { + font-size: 14px; + } - .bdr { - border-right: 1px solid #ccc; - } + .bdr { + border-right: 1px solid #ccc; + } - .bdl { - border-left: 1px solid #ccc; - } + .bdl { + border-left: 1px solid #ccc; + } - .source-info { - p { - margin-bottom: .5em; - } + .source-info { + p { + margin-bottom: .5em; } + } - .freight-info-box { - width: 95%; - } + .freight-info-box { + width: 95%; + } - .freigth-label { - display : inline-block; - width : 50px; - text-align: right; - } + .freigth-label { + display: inline-block; + width: 50px; + text-align: right; + } - ::ng-deep { - .approval-status { - .ant-steps { - width : 70%; - margin: 0 auto; - } - } - } + .leftPadding { + padding-right: 100px; + } + + .hide { + display: none; + } + + .handling-col { + min-height: 90px; - .leftPadding { - padding-right: 100px; - } - .hide{ - display: none; - } .handling-info { - min-height: 100px; - border: 1px solid #ccc; - - .loading-row { - display: flex; + 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; } - - .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; + + &.unloaing-bg { + background: #F66F6A; } } - .target-fix { - display: block; - margin-top: 290px; - } -} \ No newline at end of file + } + + .info { + flex: 1; + } + + .time-info { + margin-left: 56px; + } + } + + .target-fix { + display: block; + margin-top: 290px; + } +} 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 94f27bc7..2e702a09 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 @@ -11,7 +11,7 @@
- 货源编码 : {{ i?.resourceCode }} + 货源编码 : {{ i?.resourceCode }}
- + +
+
+ + 运单号: {{ i?.wayBillCode }} +
+
+
+ + +
+
+
+ {{ i?.enterpriseInfoName }} + {{ i?.shippername }} + {{i?.enterpriseProjectName}} + {{i?.serviceTypeLabel}} + {{i?.dispatchName}} /{{i?.dispatchPhone}} + {{ i?.externalBillCode }} + {{ i?.resourceCode }} + {{ i?.paymentDays }} +
+
-
-   +
@@ -62,8 +85,51 @@
+ +
+ + 装货卸货信息 + ( + + + ) + +
+
+
+
+
+
+
装
+
+

装货地：{{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?.goodsInfos?.[0]?.goodsName}} @@ -99,43 +165,7 @@ {{ i?.settlementWeight }}吨,{{ i?.settlementVolume }}方 -
-

装货卸货信息 - ( - - - ) - -

-
-
-
-
-
-
装
-
-

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

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

-
-
-
-
-
-
-
-
-
-
卸
-
-

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

-

联系人：{{item.appUserName}}/{{item.contractTelephone}}

-
-
-
-
-
-
-
+ + [hidden]="!(i?.settlementBasis ==='1' && i?.unloadTime) && !(i?.settlementBasis ==='2' && i?.loadTime)" + [nzBorderless]="true" class="mb0"> + 运费信息到货后{{i?.goodsResource.paymentDays}}天内支付运费 @@ -176,7 +208,7 @@ i?.ruleLabel }}）
- + {{ item.price + item.surcharge | currency }} @@ -191,7 +223,7 @@
车队长：{{ i?.payeeName }}/{{ i?.payeePhone }}
- + 查看附件      @@ -209,7 +241,7 @@ - + {{i?.receiptType == 1 ?'是':'否'}} @@ -238,7 +270,7 @@ - +

| 轨迹信息

@@ -265,4 +297,4 @@ - \ No newline at end of file +