Merge branch '20418order' into 'v2-220418'

src/components/BaseInfo/BaseInfo.tsx

@@ -8,6 +8,7 @@ interface BaseInfoPorps {
   cols?: number,
   id?: string
   subtitle?: string | React.ReactNode
+  style?: any
 }
 
 /**
@@ -15,12 +16,12 @@ interface BaseInfoPorps {
  * @param param0
  * @returns
  */
-function BaseInfo({ title, subtitle, className, children, cols = 2, id }: BaseInfoPorps) {
+function BaseInfo({ title, subtitle, className, children, cols = 2, id, style }: BaseInfoPorps) {
   return (
     <Card
       id={id}
       title={
-        <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+        <div style={{ display: 'flex', justifyContent: 'space-between', ...style }}>
           <div>{title}</div>
           <div>{subtitle}</div>
         </div>

src/pages/order/receivingNote/deliveryNoteQuery/details.tsx

@@ -6,7 +6,7 @@
 import React, { useEffect, useState } from 'react'
 import AnchorPage from '@/components/AnchorPage'
 import { BaseInfo as ListInfo } from '@/components/BaseInfo'
-import { BillsInfo, DeliveryInfo, DeliveryNoteQuery, LogisticsInfo, Material, Distribution, BaseInfo, ExternalRoamRecord } from '../../constants'
+import { BillsInfo, DeliveryInfo, DeliveryNoteQuery, LogisticsInfo, Material, Distribution, BaseInfo, ExternalRoamRecord, HarvestMaterial } from '../../constants'
 import { Table, Tag } from 'antd'
 import ReceiveNoteFacotry from '../../assets/handles/ReceiveNotePage'
 import { useLocation } from 'umi'
@@ -43,9 +43,9 @@ const DeliveryNoteDetails: React.FC = () => {
       setAnchors([
         ...anchors,
         {
-          ...Material,
+          ...HarvestMaterial,
           ...{
-            name: `${Material.name}(${values[1].totalCount})`
+            name: `${HarvestMaterial.name}(${values[1].totalCount})`
           }
         },
         {
@@ -67,7 +67,7 @@ const DeliveryNoteDetails: React.FC = () => {
       anchors={anchors}
     >
 
-      <ListInfo className='mt-15' title={BillsInfo.name} id={BillsInfo.key}>
+      <ListInfo className='mt-15' title={BillsInfo.name} id={BillsInfo.key} style={{ lineHeight: 3 }}>
         <ListInfoItem label='送货单编号'>
           {info?.deliveryNo}
         </ListInfoItem>
@@ -89,7 +89,7 @@ const DeliveryNoteDetails: React.FC = () => {
         </ListInfoItem>
       </ListInfo>
 
-      <ListInfo className='mt-15' title={Distribution.name} id={Distribution.key}>
+      <ListInfo className='mt-15' title={Distribution.name} id={Distribution.key} style={{ lineHeight: 3 }}>
         <ListInfoItem label='送货日期'>
           {info?.deliveryTime}
         </ListInfoItem>
@@ -107,7 +107,7 @@ const DeliveryNoteDetails: React.FC = () => {
         </ListInfoItem>
       </ListInfo>
 
-      <ListInfo className='mt-15' title={DeliveryInfo.name} id={DeliveryInfo.key}>
+      <ListInfo className='mt-15' title={DeliveryInfo.name} id={DeliveryInfo.key} style={{ lineHeight: 3 }}>
         <ListInfoItem label='发货时间'>
           {info?.sendTime}
         </ListInfoItem>
@@ -134,7 +134,7 @@ const DeliveryNoteDetails: React.FC = () => {
 
       </ListInfo>
 
-      <ListInfo className='mt-15' title={LogisticsInfo.name} id={LogisticsInfo.key}>
+      <ListInfo className='mt-15' title={LogisticsInfo.name} id={LogisticsInfo.key} style={{ lineHeight: 3 }}>
 
         <ListInfoItem label='配送方式'>
           {info?.deliveryType === 1 ? '物流' : '自提'}
@@ -153,7 +153,7 @@ const DeliveryNoteDetails: React.FC = () => {
         </ListInfoItem>
       </ListInfo>
 
-      <ListInfo className='mt-15' title={Material.name} id={Material.key} cols={1}>
+      <ListInfo className='mt-15' title={HarvestMaterial.name} id={HarvestMaterial.key} cols={1} >
         <Table
           rowKey={row => row.orderNo}
           columns={