送货单详情页面

config/routes/orderRoute/deliveryNotice.ts

@@ -2,56 +2,58 @@
  * 订单能力 -- 送货单
  * @author: Gavin
  */
- const DeliveryNotice = [
-   {
+const DeliveryNotice = [
+  {
     path: '/memberCenter/order/deliveryNotice',
     name: '送货单',
     routes: [
       {
         /** 送货单管理SRM*/
-         path: '/memberCenter/order/deliveryNotice/manageSRM',
-         name: '送货单管理(SRM)',
-         component: '@/pages/order/deliveryNotice/manageSRM'
+        path: '/memberCenter/order/deliveryNotice/manageSRM',
+        name: '送货单管理(SRM)',
+        component: '@/pages/order/deliveryNotice/manageSRM'
       },
       {
         /** 送货单管理详情SRM*/
-         path: '/memberCenter/order/deliveryNotice/manageSRM/details',
-         name: '送货单管理详情(SRM)',
-         component: '@/pages/order/deliveryNotice/manageSRM/details',
-         hideInMenu: true,
+        path: '/memberCenter/order/deliveryNotice/manageSRM/details',
+        name: '送货单管理详情(SRM)',
+        component: '@/pages/order/deliveryNotice/manageSRM/details',
+        hideInMenu: true,
+        noMargin: true
       },
 
 
       {
         /** 送货单管理B2B*/
-         path: '/memberCenter/order/deliveryNotice/manageB2B',
-         name: '送货单管理(B2B)',
-         component: '@/pages/order/deliveryNotice/manageB2B'
+        path: '/memberCenter/order/deliveryNotice/manageB2B',
+        name: '送货单管理(B2B)',
+        component: '@/pages/order/deliveryNotice/manageB2B'
       },
       {
         /** 送货单管理详情B2B*/
-         path: '/memberCenter/order/deliveryNotice/manageB2B/details',
-         name: '送货单管理详情(B2B)',
-         component: '@/pages/order/deliveryNotice/manageB2B/details',
-         hideInMenu: true,
+        path: '/memberCenter/order/deliveryNotice/manageB2B/details',
+        name: '送货单管理详情(B2B)',
+        component: '@/pages/order/deliveryNotice/manageB2B/details',
+        hideInMenu: true,
+        noMargin: true
       },
 
 
       {
         /** 收货单查询*/
-         path: '/memberCenter/order/deliveryNotice/receivingNoteQuery',
-         name: '收货单查询',
-         component: '@/pages/order/deliveryNotice/receivingNoteQuery'
+        path: '/memberCenter/order/deliveryNotice/receivingNoteQuery',
+        name: '收货单查询',
+        component: '@/pages/order/deliveryNotice/receivingNoteQuery'
       },
       {
         /** 收货单详情*/
-         path: '/memberCenter/order/deliveryNotice/receivingNoteQuery/details',
-         name: '收货单详情',
-         component: '@/pages/order/deliveryNotice/receivingNoteQuery/details',
-         hideInMenu: true,
+        path: '/memberCenter/order/deliveryNotice/receivingNoteQuery/details',
+        name: '收货单详情',
+        component: '@/pages/order/deliveryNotice/receivingNoteQuery/details',
+        hideInMenu: true,
       },
     ]
-   }
- ]
+  }
+]
 
 export default DeliveryNotice
\ No newline at end of file

config/routes/orderRoute/receivingNote.ts

@@ -34,7 +34,8 @@ const ReceivingNote = [
         path: '/memberCenter/order/receivingNote/deliveryNoteManage/add',
         name: '新增收货单',
         component: '@/pages/order/receivingNote/deliveryNoteManage/add',
-        noMargin: true
+        noMargin: true,
+        hideInMenu: true
       },
       {
         /** 收货单管理详情*/

src/pages/order/constants/anchors.ts

@@ -51,6 +51,11 @@ const PlanMaterial: AnchorsItem = {
   name: "计划送货物料"
 }
 
+const DeliveryGood: AnchorsItem = {
+  key: 'DeliveryGood',
+  name: '送货商品'
+}
+
 const DeliveryNoteQuery: AnchorsItem[] = [
   BillsInfo,
   Distribution,
@@ -77,5 +82,6 @@ export {
   Circulation,
   PlanMaterial,
   DeliveryNoteQuery,
-  DeliveryPlanDetails
+  DeliveryPlanDetails,
+  DeliveryGood
 }
\ No newline at end of file

src/pages/order/constants/label.ts

 export const ReceiptAddLabel = '新增收货单';
 
 export const ReceiptAbstractLabel = '收货单摘要';
+export const DeliveryAbstractLabel = '送货单摘要';
 export const SupplyMembersLabel = '供应会员';
 export const NoteLabel = '备注';
 
 
 export const ConsigneeLabel = '收货人';
-export const ConsigneeTimeLable = '收货时间';
+export const ConsigneeTimeLabel = '收货时间';
 export const ConsigneePhoneLabel = '收货人电话';
 
 export const DeliveryOrderNoLabel = '送货订单号';
+export const DeliveryNoLabel = '送货单编号';
+export const DeliveryDateLabel = '发货日期';
 export const DeliveryTimeLabel = '发货时间';
-export const DeliveryAddrLabel = '送货自提地址';
+export const DeliveryAddrLabel = '送货地址';
+export const DeliverySlefAddrLabel = '送货（自提）地址';
+export const DeliveryNameLabel = '送货人';
+export const DeliveryPhoneLabel = '送货人电话';
 
-export const LogisticsCompanyLable = '物流公司';
-export const LogisticsCarNoLable = '车牌号码';
-export const LogisticsNoLable = '物流单号';
+export const LogisticsCompanyLabel = '物流公司';
+export const LogisticsCarNoLabel = '车牌号码';
+export const LogisticsNoLabel = '物流单号';
 
 
+export const BuyerLabel = '采购会员';
+export const OutStatusLabel = '外部状态';
+
+export const DeliveryTypeLabel = '配送方式';
 
 
 

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

@@ -3,23 +3,96 @@
  * @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'
+
+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>
+
+    </AnchorPage>
+  )
+}
+
+export default DeliveryNoticeManageSRMDetails
\ No newline at end of file

src/pages/order/receivingNote/deliveryNoteManage/add.tsx

@@ -4,8 +4,7 @@ import { useState } from "react"
 import {
   BillsInfo, DeliveryInfo, LogisticsInfo, Harvest, HarvestMaterial,
   ReceiptAddLabel, ReceiptAbstractLabel, SupplyMembersLabel, NoteLabel, DeliveryTimeLabel,
-  ConsigneeLabel, DeliveryAddrLabel, DeliveryOrderNoLabel, ConsigneePhoneLabel, ConsigneeTimeLable,
-  LogisticsCompanyLable, LogisticsCarNoLable, LogisticsNoLable
+  ConsigneeLabel, DeliveryAddrLabel, DeliveryOrderNoLabel, ConsigneePhoneLabel, ConsigneeTimeLabel, LogisticsCompanyLabel, LogisticsCarNoLabel, LogisticsNoLabel
 } from '../../constants'
 import { DatePicker, Form, Input, Table } from 'antd'
 import { FormItem } from '@/components/FormItem'
@@ -47,7 +46,7 @@ function DeliveryNoteAddForm() {
       </BaseInfo>
 
       <BaseInfo title={Harvest.name} id={Harvest.key}>
-        <BaseInfo.BaseInfoItem label={ConsigneeTimeLable}>
+        <BaseInfo.BaseInfoItem label={ConsigneeTimeLabel}>
           <FormItem>
             <DatePicker className="w-full" />
           </FormItem>
@@ -84,10 +83,10 @@ function DeliveryNoteAddForm() {
       </BaseInfo>
 
       <BaseInfo title={LogisticsInfo.name} id={LogisticsInfo.key}>
-        <BaseInfo.BaseInfoItem label={LogisticsCompanyLable}>
+        <BaseInfo.BaseInfoItem label={LogisticsCompanyLabel}>
           HF200019343344
         </BaseInfo.BaseInfoItem>
-        <BaseInfo.BaseInfoItem label={LogisticsCarNoLable}>
+        <BaseInfo.BaseInfoItem label={LogisticsCarNoLabel}>
           <div className="#LogisticsAddr">
             <div className="#LogisticsAddrDisc leading-10">
               广东省广州市海珠区新港东路1068号中洲中心
@@ -97,7 +96,7 @@ function DeliveryNoteAddForm() {
             </div>
           </div>
         </BaseInfo.BaseInfoItem>
-        <BaseInfo.BaseInfoItem label={LogisticsNoLable}>
+        <BaseInfo.BaseInfoItem label={LogisticsNoLabel}>
           2012 / 09 / 10
         </BaseInfo.BaseInfoItem>
       </BaseInfo>