fix: 合并前提交

src/pages/order/constants/status.ts

@@ -87,7 +87,7 @@ class TagStatus {
    * @param value 
    */
   getTagStyle(status: string | number) {
-    return this.#tagStatusColor[status];
+    return this.#tagStatusColor[status] ? this.#tagStatusColor[status] : this.defaultStatusStyle();
   }
 
 }

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

@@ -32,7 +32,7 @@ export const UntilColumn = {
 
 export const OrderNoColumn = {
   title: '订单号',
-  render: (txt, roced) => txt
+  render: (txt, roced) => roced.id
 }
 
 export const OrderCreatedAtColumn = {

src/pages/order/deliveryPlanManagement/deliveryPlanQuery/details.tsx

@@ -4,7 +4,7 @@
  */
 import React, { useState } from 'react'
 import { history } from 'umi'
-import { Card, Descriptions, Steps, Tag } from 'antd'
+import { Card, Descriptions, Steps, Table, Tag } from 'antd'
 import AnchorPage from '@/components/AnchorPage'
 import { AnchorsItem } from "@/components/AnchorPage"
 import BaseInfo from '@/components/BaseInfo/BaseInfo'
@@ -15,6 +15,59 @@ const DeliveryPlanManagementDetails: React.FC = () => {
   const [iAnchors, setiAnchors] = useState<AnchorsItem[]>(DeliveryPlanDetails)
   const [details, setDetails] = useState<any>({})
 
+  const columns = [
+    { title: '物料编号', dataIndex: 'name1', },
+    { title: '物料名称', dataIndex: 'name2', },
+    { title: '规格型号', dataIndex: 'name3', },
+    { title: '品类', dataIndex: 'name4', },
+    { title: '品牌', dataIndex: 'name5', },
+    { title: '单位', dataIndex: 'name6', },
+    { title: '订单数量', dataIndex: 'name7', },
+    { title: '收货数量', dataIndex: 'name8', },
+    { title: '在途数量', dataIndex: 'name9', },
+    { title: '待送货数量', dataIndex: 'name10', },
+    { title: '计划送货数量', dataIndex: 'name11', },
+  ]
+  const data = [
+    { 
+      'name1': 'Q89YTE1',
+      'name2': '进口头层黄牛皮荔枝纹',
+      'name3': '红色/XXL/厚1.5mm',
+      'name4': '牛皮',
+      'name5': 'PELLE',
+      'name6': '尺',
+      'name7': '10,000',
+      'name8': '10,000',
+      'name9': '10,000',
+      'name10': '10,000',
+      'name11': '10,000',
+     }
+  ]
+  const expandedRowRender = () => {
+    const columns = [
+      { title: '订单号', dataIndex: 'name1', },
+      { title: '订单摘要', dataIndex: 'name2', },
+      { title: '下单时间', dataIndex: 'name3', },
+      { title: '订单数量', dataIndex: 'name4', },
+      { title: '收货数量', dataIndex: 'name5', },
+      { title: '在途数量', dataIndex: 'name6', },
+      { title: '待送货数量', dataIndex: 'name7', },
+      { title: '计划送货数量', dataIndex: 'name8', },
+    ]
+    const data = [
+      {
+        'name1': 'DPTY12',
+        'name2': '进口头层黄牛皮荔枝纹',
+        'name3': '规格型号',
+        'name4': '2020-08-25 09:50',
+        'name5': '20,000',
+        'name6': '4,000',
+        'name7': '2,000',
+        'name8': '14,000',
+      }
+    ]
+    return <Table columns={columns} dataSource={data} pagination={false} />
+  }
   return (
     <AnchorPage
       title={details?.name || '没有title'}
@@ -44,8 +97,12 @@ const DeliveryPlanManagementDetails: React.FC = () => {
         <Tag color='green'>已提交</Tag>
         </BaseInfo.BaseInfoItem>
       </BaseInfo>
-      <BaseInfo className='mt-1' title={PlanMaterial.name} id={PlanMaterial.key}>
-      计划送货物料
+      <BaseInfo className='mt-1' title={PlanMaterial.name} id={PlanMaterial.key} cols={1}>
+        <Table
+          columns={columns}
+          expandable={{ expandedRowRender }}
+          dataSource={data}
+        />
       </BaseInfo>
       
     </AnchorPage>

src/pages/order/deliveryPlanManagement/deliveryPlanQuery/index.tsx

@@ -18,7 +18,6 @@ import { TagStatus } from '../../constants/status'
 
 const tagStatus = new TagStatus()
 
-
 const DeliveryPlanManagementQuery: React.FC = () => {
   const ref = useRef<any>({})
   const formActions = createFormActions()