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 601a0121..b1beb110 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 @@ -10,9 +10,9 @@

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

-
-
网络货运人:{{ i?.shipperAppUserName }}
-
+
+
网络货运人:{{ i?.shipperAppUserName }}
+
-
+
{{ i?.enterpriseProjectName }} @@ -41,9 +41,9 @@

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

-
-
网络货运人:{{ i?.shipperAppUserName }}
-
+
+
网络货运人:{{ i?.shipperAppUserName }}
+
-
+ + +
{{ i?.enterpriseProjectName }} {{ i?.deadlineTime }} {{ i?.createUserName }}/{{ i?.createUserPhone }} @@ -66,8 +66,8 @@ {{ i?.serviceTypeLabel }}
-
- +
+
-

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

+
+
@@ -95,7 +104,7 @@

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

-

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

+

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

@@ -109,7 +118,7 @@

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

-

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

+

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

@@ -140,6 +149,15 @@ {{item.carModelLabel || '--'}} / {{item.carLengthLabel || '--'}} + + {{i?.carrierInformationVO?.driverName || '--'}} / {{i?.carrierInformationVO?.driverTelephone || '--'}} / + {{i?.carrierInformationVO?.driverLicensePlate || '--'}} + + + {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight || + '--')+'吨'}} + - + +
+ + 补充信息 +
{{ i?.supplementaryInformationVO?.stateReceipt ? '是' : '否' }} @@ -213,10 +243,14 @@
- + +
+ + 操作日志 +
+ [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [size]="'small'">
diff --git a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less index df21f696..ef0733e8 100644 --- a/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less +++ b/src/app/routes/supply-management/components/bulk-detail/bulk-detail.component.less @@ -48,7 +48,7 @@ } .handling-info { - min-height: 100px; + min-height: 90px; border: 1px solid #ccc; .loading-row { 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 4d122788..43c1da1b 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 @@ -6,39 +6,6 @@ - -
- -

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

-
-
-
网络货运人:{{ i?.enterpriseInfoName }}
-
- - - - -
-
-
-
- 总费用:{{ i?.totalAmount | currency }} -
-
- -
- {{ i?.externalResourceCode }} - {{ i?.enterpriseProjectName }} - {{ i?.createUserName }}/{{ i?.createUserPhone }} - {{ i?.dispatchName }}/{{ i?.dispatchPhone }} - {{ i?.serviceTypeLabel }} -
-
@@ -85,52 +52,24 @@
- - -
- - 基本信息 -
- - - - - {{ item.goodsTypeName }} - {{ item.goodsName }} - - {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 - - - - - - {{ i?.carrierInformationVO?.driverName }} - - - {{ i?.carrierInformationVO?.driverTelephone }} - - - {{ i?.carrierInformationVO?.driverLicensePlate }} - - - - - {{i?.carrierInformationVO.driverName || '--'}} / {{i?.carrierInformationVO.driverTelephone || '--'}} / - {{i?.carrierInformationVO.driverLicensePlate || '--'}} - - - {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight || - '--')+'吨'}} - -
-

装货卸货信息 + +
+ + 装货卸货信息 + ( + + + ) + +
@@ -168,6 +107,42 @@
+ +
+ + 基本信息 +
+ + + + + {{ item.goodsTypeName }} - {{ item.goodsName }} + + {{ item.weight }}吨,{{ item.volume }}方,{{ item.number }}件 + + {{i?.carrierInformationVO?.driverName || '--'}} / {{i?.carrierInformationVO?.driverTelephone || '--'}} / + {{i?.carrierInformationVO?.driverLicensePlate || '--'}} + + + {{i?.driverCarModelLabel || '--'}} / {{(i?.driverCarLength || '--') +'米'}} / {{(i?.driverCarWeight || + '--')+'吨'}} + + + + +
+
@@ -206,7 +181,7 @@
-

+

{{ i?.totalAmount | currency }} @@ -251,7 +226,7 @@

+ [res]="{ reName: { list: 'data.records', total: 'data.total' } }" [size]="'small'">
{{ item?.operator }} {{ item?.telephone ? '/' + item?.telephone : '' }} @@ -260,4 +235,4 @@
- \ No newline at end of file + diff --git a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less index 172f5525..2fd2b362 100644 --- a/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less +++ b/src/app/routes/supply-management/components/vehicle-detail/vehicle-detail.component.less @@ -48,7 +48,7 @@ } .handling-info { - min-height: 176px; + min-height: 100px; border: 1px solid #ccc; .loading-row { @@ -79,6 +79,7 @@ .time-info { margin-left: 56px; + margin-bottom: 0; } } } diff --git a/src/styles/theme.less b/src/styles/theme.less index 1082d2fa..82b97923 100644 --- a/src/styles/theme.less +++ b/src/styles/theme.less @@ -24,3 +24,7 @@ .ant-btn { border-radius: 4px; } + +.ant-card-body { + padding: 16px; +}