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

src/pages/order/deliveryNotice/receivingNoteQuery/details.tsx

@@ -10,7 +10,7 @@ import {
   DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel,
   DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel,
   Distribution, ExternalRoamRecord, Harvest, LogisticsCarNoLabel, LogisticsCompanyLabel,
-  LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel, ReceiptAbstractLabel, ReceivingAddress, ReceivingTime, ReNoLabel
+  LogisticsInfo, LogisticsNoLabel, Material, NoteLabel, OutStatusLabel, ReceiptAbstractLabel, ReceivingAddress, ReceivingTime, ReNoLabel
 } from '../../constants'
 import { BaseInfo as ContentBox } from '@/components/BaseInfo'
 import { Table } from 'antd';
@@ -32,8 +32,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
     Harvest,
     DeliveryInfo,
     LogisticsInfo,
-    DeliveryGood,
-    ExternalRoamRecord
+
+    // ExternalRoamRecord
   ])
 
   const [info, setInfo] = useState<any>({});
@@ -52,6 +52,21 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
     service.getDetailInfoProductById(query.id as string).then(res => {
       setTableDataSource(res?.data)
 
+      setAnchors([
+        ...anchors,
+        info?.type === 1 ? {
+          ...DeliveryGood,
+          ...{
+            name: `${DeliveryGood.name}(${res?.data?.length})`
+          }
+        } : {
+          ...Material,
+          ...{
+            name: `${Material.name}(${res?.data?.length})`
+          }
+        },
+      ]);
+
       setTotalCount(res?.totalCount)
     })
 
@@ -178,7 +193,8 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
       </ContentBox>
 
 
-      <ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
+      <ContentBox title={info?.type ? DeliveryGood.name : Material.name}
+        id={info?.type ? DeliveryGood.key : Material.key} cols={1}>
 
         <Table
           columns={
@@ -193,13 +209,13 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
 
       </ContentBox>
 
-      <ContentBox title={ExternalRoamRecord.name} id={ExternalRoamRecord.key} cols={1}>
+      {/* <ContentBox title={ExternalRoamRecord.name} id={ExternalRoamRecord.key} cols={1}>
         <Table
           columns={ExternalRoamRecordTableColumn}
           rowKey="id"
           dataSource={outerHistoryList}
         />
-      </ContentBox>
+      </ContentBox> */}
 
     </AnchorPage>
   )