送货单 SRM B2B 收货单 详情页面

config/routes/orderRoute/deliveryNotice.ts

@@ -51,6 +51,7 @@ const DeliveryNotice = [
         name: '收货单详情',
         component: '@/pages/order/deliveryNotice/receivingNoteQuery/details',
         hideInMenu: true,
+        noMargin: true,
       },
     ]
   }

src/pages/order/constants/page-table-column.ts

@@ -11,4 +11,22 @@ export const DeliveryNoteAddFromTableColumn = [
   OredrNumColumn,
   DeliveryNumColumn,
   ConsigneeNumColumn
-]
\ No newline at end of file
+]
+
+export const DeliveryNoticeTableColumn = [
+  {
+    title: '商品ID',
+    render: (txt) => txt
+  },
+  {
+    title: "商品名称",
+    render: (_, roced) => roced.id
+  },
+  ClassColumn,
+  BrandColumn,
+  UntilColumn,
+  OrderNoColumn,
+  OrderCreatedAtColumn,
+  OredrNumColumn,
+  DeliveryNumColumn
+];
\ No newline at end of file

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

@@ -7,6 +7,8 @@ import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
 import React, { useState } from 'react'
 import { BillsInfo, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel } from '../../constants'
 import { BaseInfo as ContentBox } from '@/components/BaseInfo'
+import { Table } from 'antd';
+import { DeliveryNoticeTableColumn } from '../../constants/page-table-column';
 
 const ContentBoxItem = ContentBox.BaseInfoItem;
 
@@ -91,6 +93,14 @@ const DeliveryNoticeManageSRMDetails: React.FC = () => {
         </ContentBoxItem>
       </ContentBox>
 
+
+      <ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
+
+        <Table columns={DeliveryNoticeTableColumn}/>
+
+      </ContentBox>
+
+
     </AnchorPage>
   )
 }

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

@@ -3,23 +3,106 @@
  * @author: Gavin
  * @description: 与B2B内容大致相同，文件分开方便后续对接以及日后变动修改二开
  */
- import React, { useState } from 'react'
- import { PageHeaderWrapper } from '@ant-design/pro-layout'
- import { history } from 'umi'
- import ReutrnEle from '@/components/ReturnEle'
- 
- const DeliveryNoticeManageSRMDetails: React.FC = () => {
-   const [details, setDetails] = useState<any>({})
-   
-   return (
-     <PageHeaderWrapper
-       title={details?.name}
-       onBack={() => history.goBack()}
-       backIcon={<ReutrnEle />}
-     >
-       <div>送货单 - 送货单管理详情SRM</div>
-     </PageHeaderWrapper>
-   )
- }
- 
- export default DeliveryNoticeManageSRMDetails
\ No newline at end of file
+import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
+import React, { useState } from 'react'
+import { BillsInfo, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel } from '../../constants'
+import { BaseInfo as ContentBox } from '@/components/BaseInfo'
+import { Table } from 'antd';
+import { DeliveryNoticeTableColumn } from '../../constants/page-table-column';
+
+const ContentBoxItem = ContentBox.BaseInfoItem;
+
+const DeliveryNoticeManageSRMDetails: React.FC = () => {
+  const [anchors, setAnchors] = useState<AnchorsItem[]>([
+    BillsInfo,
+    Distribution,
+    DeliveryInfo,
+    LogisticsInfo,
+    DeliveryGood,
+  ])
+
+  return (
+    <AnchorPage title="送货单管理详情(SRM)"
+      anchors={anchors}
+    >
+
+      <ContentBox title={BillsInfo.name} id={BillsInfo.key}>
+        <ContentBoxItem label={DeliveryNoLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliveryAbstractLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={NoteLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={OutStatusLabel}>
+
+        </ContentBoxItem>
+      </ContentBox>
+
+      <ContentBox title={Distribution.name} id={Distribution.key}>
+        <ContentBoxItem label={DeliveryDateLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliveryNameLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliveryTimeLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliveryPhoneLabel}>
+
+        </ContentBoxItem>
+      </ContentBox>
+
+      <ContentBox title={DeliveryInfo.name} id={DeliveryInfo.key}>
+        <ContentBoxItem label={ConsigneeTimeLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliveryAddrLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliverySlefAddrLabel}>
+
+        </ContentBoxItem>
+
+      </ContentBox>
+
+      <ContentBox title={LogisticsInfo.name} id={LogisticsInfo.key}>
+
+        <ContentBoxItem label={DeliveryTypeLabel}>
+
+        </ContentBoxItem>
+        <ContentBoxItem label={LogisticsCarNoLabel}>
+
+        </ContentBoxItem>
+        <ContentBoxItem label={LogisticsCompanyLabel}>
+
+        </ContentBoxItem>
+        <ContentBoxItem label={LogisticsNoLabel}>
+
+        </ContentBoxItem>
+      </ContentBox>
+
+
+      <ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
+
+        <Table columns={DeliveryNoticeTableColumn} />
+
+      </ContentBox>
+
+
+    </AnchorPage>
+  )
+}
+
+export default DeliveryNoticeManageSRMDetails
\ No newline at end of file

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

 /**
- * 订单能力 - 送货单 - 收货单详情
+ * 订单能力 - 送货单 - 送货单管理详情SRM
  * @author: Gavin
- * @description:
+ * @description: 与B2B内容大致相同，文件分开方便后续对接以及日后变动修改二开
  */
- import React, { useState } from 'react'
- import { PageHeaderWrapper } from '@ant-design/pro-layout'
- import { history } from 'umi'
- import ReutrnEle from '@/components/ReturnEle'
- 
- const ReceivingNoteDetails: React.FC = () => {
-   const [details, setDetails] = useState<any>({})
-   
-   return (
-     <PageHeaderWrapper
-       title={details?.name}
-       onBack={() => history.goBack()}
-       backIcon={<ReutrnEle />}
-     >
-       <div>送货单 - 收货单详情</div>
-     </PageHeaderWrapper>
-   )
- }
- 
- export default ReceivingNoteDetails
\ No newline at end of file
+import AnchorPage, { AnchorsItem } from '@/components/AnchorPage'
+import React, { useState } from 'react'
+import { BillsInfo, ConsigneeLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, DeliveryAbstractLabel, DeliveryAddrLabel, DeliveryDateLabel, DeliveryGood, DeliveryInfo, DeliveryNameLabel, DeliveryNoLabel, DeliveryPhoneLabel, DeliverySlefAddrLabel, DeliveryTimeLabel, DeliveryTypeLabel, Distribution, LogisticsCarNoLabel, LogisticsCompanyLabel, LogisticsInfo, LogisticsNoLabel, NoteLabel, OutStatusLabel } from '../../constants'
+import { BaseInfo as ContentBox } from '@/components/BaseInfo'
+import { Table } from 'antd';
+import { DeliveryNoticeTableColumn } from '../../constants/page-table-column';
+
+const ContentBoxItem = ContentBox.BaseInfoItem;
+
+const DeliveryNoticeManageSRMDetails: React.FC = () => {
+  const [anchors, setAnchors] = useState<AnchorsItem[]>([
+    BillsInfo,
+    Distribution,
+    DeliveryInfo,
+    LogisticsInfo,
+    DeliveryGood,
+  ])
+
+  return (
+    <AnchorPage title="送货单管理详情(B2B)"
+      anchors={anchors}
+    >
+
+      <ContentBox title={BillsInfo.name} id={BillsInfo.key}>
+        <ContentBoxItem label={DeliveryNoLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliveryAbstractLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={NoteLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={OutStatusLabel}>
+
+        </ContentBoxItem>
+      </ContentBox>
+
+      <ContentBox title={Distribution.name} id={Distribution.key}>
+        <ContentBoxItem label={DeliveryDateLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliveryNameLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliveryTimeLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliveryPhoneLabel}>
+
+        </ContentBoxItem>
+      </ContentBox>
+
+      <ContentBox title={DeliveryInfo.name} id={DeliveryInfo.key}>
+        <ContentBoxItem label={ConsigneeTimeLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliveryAddrLabel}>
+
+        </ContentBoxItem>
+
+        <ContentBoxItem label={DeliverySlefAddrLabel}>
+
+        </ContentBoxItem>
+
+      </ContentBox>
+
+      <ContentBox title={LogisticsInfo.name} id={LogisticsInfo.key}>
+
+        <ContentBoxItem label={DeliveryTypeLabel}>
+
+        </ContentBoxItem>
+        <ContentBoxItem label={LogisticsCarNoLabel}>
+
+        </ContentBoxItem>
+        <ContentBoxItem label={LogisticsCompanyLabel}>
+
+        </ContentBoxItem>
+        <ContentBoxItem label={LogisticsNoLabel}>
+
+        </ContentBoxItem>
+      </ContentBox>
+
+
+      <ContentBox title={DeliveryGood.name} id={DeliveryGood.key} cols={1}>
+
+        <Table columns={DeliveryNoticeTableColumn} />
+
+      </ContentBox>
+
+
+    </AnchorPage>
+  )
+}
+
+export default DeliveryNoticeManageSRMDetails
\ No newline at end of file

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

@@ -60,7 +60,7 @@ const ReceivingNoteQuery: React.FC = () => {
       dataIndex: 'id',
       key: 'id',
       width: 160,
-      render: (text: unknown, record: unknown) => <EyePreview url='/memberCenter/order/deliveryNoticed/receivingNoteQuery/details'>{text}</EyePreview>
+      render: (text: unknown, record: unknown) => <EyePreview url='/memberCenter/order/deliveryNotice/receivingNoteQuery/details'>{text}</EyePreview>
     },
     { title: '收货单摘要', dataIndex: 'id2', key: 'id2' },
     { title: '收货日期', dataIndex: 'id3', key: 'id3' },