Merge branch 'v2-0418-transferOrder-molei' into 'v2-220418'

config/routes/orderRoute/receivingNote.ts

@@ -9,31 +9,33 @@ const ReceivingNote = [
     routes: [
       {
         /** 送货单查询*/
-         path: '/memberCenter/order/receivingNote/deliveryNoteQuery',
-         name: '送货单查询',
-         component: '@/pages/order/receivingNote/deliveryNoteQuery'
+        path: '/memberCenter/order/receivingNote/deliveryNoteQuery',
+        name: '送货单查询',
+        component: '@/pages/order/receivingNote/deliveryNoteQuery'
       },
       {
         /** 送货单详情*/
-         path: '/memberCenter/order/receivingNote/deliveryNoteQuery/details',
-         name: '送货单详情',
-         component: '@/pages/order/receivingNote/deliveryNoteQuery/details',
-         hideInMenu: true,
+        path: '/memberCenter/order/receivingNote/deliveryNoteQuery/details',
+        name: '送货单详情',
+        component: '@/pages/order/receivingNote/deliveryNoteQuery/details',
+        hideInMenu: true,
+        noMargin: true
       },
 
 
       {
         /** 收货单管理*/
-         path: '/memberCenter/order/receivingNote/deliveryNoteManage',
-         name: '收货单管理',
-         component: '@/pages/order/receivingNote/deliveryNoteManage'
+        path: '/memberCenter/order/receivingNote/deliveryNoteManage',
+        name: '收货单管理',
+        component: '@/pages/order/receivingNote/deliveryNoteManage'
       },
       {
         /** 收货单管理详情*/
-         path: '/memberCenter/order/receivingNote/deliveryNoteManage/details',
-         name: '收货单管理详情',
-         component: '@/pages/order/receivingNote/deliveryNoteManage/details',
-         hideInMenu: true,
+        path: '/memberCenter/order/receivingNote/deliveryNoteManage/details',
+        name: '收货单管理详情',
+        component: '@/pages/order/receivingNote/deliveryNoteManage/details',
+        hideInMenu: true,
+        noMargin: true
       },
     ]
   }

src/components/AnchorPage/index.tsx

@@ -21,7 +21,7 @@ export interface AnchorsItem {
   /**
    * 名称
    */
-  name: React.ReactNode,
+  name: React.ReactNode | string,
 }
 
 interface IProps {

src/components/BaseInfo/BaseInfo.tsx

@@ -2,9 +2,9 @@ import { Card } from 'antd';
 import React from 'react';
 
 interface BaseInfoPorps {
-  title?: string
+  title?: string | React.ReactNode
   className?: string
-  children: JSX.Element[]
+  children: React.ReactNode
   cols?: number,
   id?: string
 }
@@ -34,10 +34,10 @@ function BaseInfoItem({ label, children }: {
 }) {
   return (
     <div className='base_info_item flex text-lg'>
-      <div className='label flex-grow-0 w-60 text-gray-400'>
+      <div className='label flex-4 flex-grow-0 w-100 text-gray-400'>
         {label}
       </div>
-      <div className='value font-semibold'>
+      <div className='value flex-auto'>
         {typeof children === 'string' ? <span>{children}</span> : children}
       </div>
     </div>

src/components/BaseInfo/index.ts

+import BaseInfo from "./BaseInfo";
+
+export {
+  BaseInfo
+}
\ No newline at end of file

src/pages/order/receivingNote/columns/anchors.ts

+import { AnchorsItem } from "@/components/AnchorPage";
+
+const BaseInfo: AnchorsItem = {
+  key: 'BaseInfo',
+  name: "基本信息"
+}
+
+const BillsInfo: AnchorsItem = {
+  key: "BillsInfo",
+  name: "单据信息"
+}
+
+const Distribution: AnchorsItem = {
+  key: "Distribution",
+  name: "单据信息"
+}
+
+const DeliveryInfo: AnchorsItem = {
+  key: "DeliveryInfo",
+  name: "发货信息"
+}
+
+const LogisticsInfo: AnchorsItem = {
+  key: "DeliveryInfo",
+  name: "物流信息单"
+}
+
+const Material: AnchorsItem = {
+  key: "Material",
+  name: "送货物料"
+}
+
+const DeliveryNoteQuery: AnchorsItem[] = [
+  BaseInfo,
+  Distribution,
+  BillsInfo,
+  DeliveryInfo,
+  LogisticsInfo,
+  Material
+]
+
+export {
+  BaseInfo,
+  BillsInfo,
+  DeliveryInfo,
+  LogisticsInfo,
+  Material,
+  Distribution,
+  DeliveryNoteQuery
+}
\ No newline at end of file

src/pages/order/receivingNote/columns/index.ts

+export * from './anchors'

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

@@ -3,23 +3,106 @@
  * @author: Gavin
  * @description:
  */
- import React, { useState } from 'react'
- import { PageHeaderWrapper } from '@ant-design/pro-layout'
- import { history } from 'umi'
- import ReutrnEle from '@/components/ReturnEle'
- 
- const DeliveryNoteManageDetails: React.FC = () => {
-   const [details, setDetails] = useState<any>({})
-   
-   return (
-     <PageHeaderWrapper
-       title={details?.name}
-       onBack={() => history.goBack()}
-       backIcon={<ReutrnEle />}
-     >
-       <div>收货单 - 收货单管理详情</div>
-     </PageHeaderWrapper>
-   )
- }
- 
- export default DeliveryNoteManageDetails
+import React, { useState } from 'react'
+import AnchorPage from '@/components/AnchorPage'
+import { BaseInfo as ListInfo } from '@/components/BaseInfo'
+import { BillsInfo, DeliveryInfo, DeliveryNoteQuery, Distribution, LogisticsInfo, Material } from '../columns'
+import { Tag } from 'antd';
+
+const ListInfoItem = ListInfo.BaseInfoItem;
+
+const DeliveryNoteManageDetails: React.FC = () => {
+
+  const anchors = DeliveryNoteQuery
+
+  return (
+    <AnchorPage
+      title="2014-07-01 进口头层黄牛皮荔枝纹送货单|FH2014070100001"
+      anchors={anchors}
+    >
+
+      <ListInfo className='mt-15' title={BillsInfo.name} id={BillsInfo.key}>
+        <ListInfoItem label='送货单'>
\ No newline at end of file
+          SH2014071000001
+        </ListInfoItem>
+
+        <ListInfoItem label='供应会员'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='送货单摘要'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='备注'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='外部状态'>
+          <Tag color="green">已提交</Tag>
+        </ListInfoItem>
+      </ListInfo>
+
+      <ListInfo className='mt-15' title={Distribution.name} id={Distribution.key}>
+        <ListInfoItem label='送货日期'>
+          SH2014071000001
+        </ListInfoItem>
+
+        <ListInfoItem label='送货人'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='送货时间'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='送货电话'>
+          广州白马
+        </ListInfoItem>
+      </ListInfo>
+
+      <ListInfo className='mt-15' title={DeliveryInfo.name} id={DeliveryInfo.key}>
+        <ListInfoItem label='送货日期'>
+          SH2014071000001
+        </ListInfoItem>
+
+        <ListInfoItem label='送货人'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='送货时间'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='送货电话'>
+          广州白马
+        </ListInfoItem>
+      </ListInfo>
+
+      <ListInfo className='mt-15' title={LogisticsInfo.name} id={LogisticsInfo.key}>
+        <ListInfoItem label='物流方式'>
+          SH2014071000001
+        </ListInfoItem>
+
+        <ListInfoItem label='物流单号'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='物流公司'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='车牌号码'>
+          广州白马
+        </ListInfoItem>
+      </ListInfo>
+
+      <ListInfo className='mt-15' title={Material.name} id={Material.key}>
+
+      </ListInfo>
+
+    </AnchorPage>
+  )
+}
+
+export default DeliveryNoteManageDetails
\ No newline at end of file

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

@@ -4,16 +4,104 @@
  * @description:
  */
 import React, { useState } from 'react'
-import { PageHeader } from '@/components/PageHeader'
+import AnchorPage from '@/components/AnchorPage'
+import { BaseInfo as ListInfo } from '@/components/BaseInfo'
+import { BillsInfo, DeliveryInfo, DeliveryNoteQuery, LogisticsInfo, Material, Distribution } from '../columns'
+import { Tag } from 'antd'
+
+const ListInfoItem = ListInfo.BaseInfoItem;
 
 const DeliveryNoteDetails: React.FC = () => {
 
+  const anchors = DeliveryNoteQuery
+
   return (
-    <PageHeader
+    <AnchorPage
       title="2014-07-01 进口头层黄牛皮荔枝纹送货单|FH2014070100001"
+      anchors={anchors}
     >
-      <div>收货单 - 送货单详情</div>
-    </PageHeader>
+
+      <ListInfo className='mt-15' title={BillsInfo.name} id={BillsInfo.key}>
+        <ListInfoItem label='送货单'>
+          SH2014071000001
+        </ListInfoItem>
+
+        <ListInfoItem label='供应会员'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='送货单摘要'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='备注'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='外部状态'>
+          <Tag color="green">已提交</Tag>
+        </ListInfoItem>
+      </ListInfo>
+
+      <ListInfo className='mt-15' title={Distribution.name} id={Distribution.key}>
+        <ListInfoItem label='送货日期'>
+          SH2014071000001
+        </ListInfoItem>
+
+        <ListInfoItem label='送货人'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='送货时间'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='送货电话'>
+          广州白马
+        </ListInfoItem>
+      </ListInfo>
+
+      <ListInfo className='mt-15' title={DeliveryInfo.name} id={DeliveryInfo.key}>
+        <ListInfoItem label='送货日期'>
+          SH2014071000001
+        </ListInfoItem>
+
+        <ListInfoItem label='送货人'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='送货时间'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='送货电话'>
+          广州白马
+        </ListInfoItem>
+      </ListInfo>
+
+      <ListInfo className='mt-15' title={LogisticsInfo.name} id={LogisticsInfo.key}>
+        <ListInfoItem label='物流方式'>
+          SH2014071000001
+        </ListInfoItem>
+
+        <ListInfoItem label='物流单号'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='物流公司'>
+          广州白马
+        </ListInfoItem>
+
+        <ListInfoItem label='车牌号码'>
+          广州白马
+        </ListInfoItem>
+      </ListInfo>
+
+      <ListInfo className='mt-15' title={Material.name} id={Material.key}>
+
+      </ListInfo>
+
+    </AnchorPage>
   )
 }
 

tailwind.config.js

@@ -66,6 +66,12 @@ module.exports = {
       10: '40px',
       11: '44px',
       12: '48px',
+      13: '54px',
+      14: '60px',
+      15: '72px',
+      16: '84px',
+      17: '96px',
+      100: '100px'
     },
     blur: {
       0: '0',
@@ -126,8 +132,8 @@ module.exports = {
       xs: ['10px', { lineHeight: '12px' }],
       sm: ['12px', { lineHeight: '14px' }],
       base: ['14px', { lineHeight: '16px' }],
-      lg: ['16px', { lineHeight: '18px' }],
-      xl: ['18px', { lineHeight: '20px' }],
+      lg: ['14px', { lineHeight: '16px' }],
+      xl: ['14px', { lineHeight: '16px' }],
       '2xl': ['20px', { lineHeight: '22px' }],
       '3xl': ['30px', { lineHeight: '30px' }],
       '4xl': ['40px', { lineHeight: '40px' }],