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 43781ffc..f97c7974 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 @@ -128,7 +128,7 @@ -

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

+

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

@@ -144,7 +144,7 @@
-

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

+

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

diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html index cb2524be..aaa5cea3 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.html @@ -13,29 +13,7 @@ -
- -

运单号: {{ i?.wayBillCode }}

-
-
-
- - -
-
-
- {{ i?.enterpriseInfoName }} - {{ i?.shippername }} - {{i?.enterpriseProjectName}} - {{i?.serviceTypeLabel}} - {{i?.dispatchName}} /{{i?.dispatchPhone}} - {{ i?.externalBillCode }} - {{ i?.resourceCode }} - {{ i?.paymentDays }} -
@@ -51,20 +29,21 @@
- -
+ +
运单号: {{ i?.wayBillCode }}
+
+ + +
-
- - -
-
+ +
{{ i?.enterpriseInfoName }} {{ i?.shippername }} @@ -85,7 +64,7 @@
- +
装货卸货信息 @@ -96,27 +75,27 @@
-
+

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

-

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

+

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

-
+

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

-

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

+

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

@@ -194,14 +173,16 @@ 结算依据为1时,卸货时间不为空,显示运费信息,否则隐藏 结算依据为2时,装货时间不为空,显示运费信息,否则隐藏 --> - +
+ + 运费信息 + 到货后{{i?.goodsResource?.paymentDays}}天内支付运费 +
+ - - 运费信息到货后{{i?.goodsResource.paymentDays}}天内支付运费 -
{{ i?.freightPrice }}{{ i?.freightTypeLabel }} ({{ i?.settlementBasisLabel }},{{ @@ -223,7 +204,11 @@
车队长:{{ i?.payeeName }}/{{ i?.payeePhone }}
- + +
+ + 附件信息 +
查看附件      @@ -241,7 +226,11 @@
- + +
+ + 补充信息 +
{{i?.receiptType == 1 ?'是':'否'}} @@ -270,7 +259,7 @@
- +

| 轨迹信息

diff --git a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less index b8327013..7086580d 100644 --- a/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/waybill-management/components/bulk-detail/bulk-detail.component.less @@ -1,70 +1,36 @@ -:host{ - .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; - } +:host { + .btn-size { + font-size: 14px; + } - ::ng-deep{ - .approval-status{ - .ant-steps{ - width: 70%; - margin: 0 auto; - } - } + .bdr { + border-right: 1px solid #ccc; + } + + .bdl { + border-left: 1px solid #ccc; + } + + .source-info { + p { + margin-bottom: .5em; } - .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; - } - } -} \ No newline at end of file + } + + .freight-info-box { + width: 95%; + } + + .freigth-label { + display: inline-block; + width: 50px; + text-align: right; + } + + + .leftPadding { + padding-right: 100px; + } + + +} diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html index a59aa3f7..e048bdc3 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.html @@ -6,7 +6,7 @@ * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @FilePath : \\tms-obc-web\\src\\app\\routes\\waybill-management\\components\\vehicle-detail\\vehicle-detail.component.html --> - +
- + +
+
+ + 运单号: {{ i?.wayBillCode }} +
+
+ + +
+
+ +
+
+ {{ i?.enterpriseInfoName }} + {{ i?.shippername }} + {{i?.enterpriseProjectName}} + {{i?.serviceTypeLabel}} + {{i?.dispatchName}}{{ i?.dispatchPhone ? '/' + i?.dispatchPhone : '' }} + {{ i?.resourceCode }} + {{ i?.paymentDays }} +
+
-
+
  -   +      
- - + +
+ + 装货卸货信息 + ( + + + ) + +
+
+
+
+
+
+
+
+

装货地:{{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}} @@ -90,45 +156,13 @@ {{i?.unloadingTime}} -
-

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

-
-
-
-
-
-
-
-

装货地:{{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?.insuranceTypeLabel}} @@ -141,7 +175,12 @@
- + +
+ + 运费信息 + (到货后{{i?.paymentDays}}天内支付运费) +
{{ item.price | currency }} @@ -162,7 +201,11 @@ }}/{{ i?.payee?.idNo }}
- + +
+ + 附件信息 +
查看附件      @@ -180,7 +223,11 @@
- + +
+ + 补充信息 +
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} @@ -196,18 +243,20 @@ {{ i?.supplementaryInformationVO?.address }} - - - - - {{ i?.supplementaryInformationVO?.remarks }} + + + + + + +
- +

| 轨迹信息

@@ -234,4 +283,4 @@ - \ No newline at end of file + diff --git a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less index 50b12799..f8ff2a38 100644 --- a/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less +++ b/src/app/routes/waybill-management/components/vehicle-detail/vehicle-detail.component.less @@ -22,58 +22,16 @@ } .freigth-label { - display : inline-block; - width : 50px; + display: inline-block; + width: 50px; text-align: right; } - ::ng-deep { - .approval-status { - .ant-steps { - width : 70%; - margin: 0 auto; - } - } - } .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; - } - } } ::ng-deep { @@ -100,4 +58,4 @@ // left: 106px; // } // } -} \ No newline at end of file +} diff --git a/src/styles/common/global.less b/src/styles/common/global.less index 1c9488df..d837061d 100644 --- a/src/styles/common/global.less +++ b/src/styles/common/global.less @@ -58,3 +58,44 @@ margin: 0 10px 10px 0; } } + + +.handling-col { + min-height: 90px; + + .handling-info { + min-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; + margin-bottom: 0; + } + } +}