fix:

src/pages/orderSystem/orderDetail/components/orderMergeInfo/index.tsx

@@ -8,10 +8,11 @@ import style from './index.less'
 import { PublicApi } from '@/services/api'
 import ContractList from '../ContractList'
 import cx from 'classnames'
+import { OrderKindType } from '../../constant'
 
 export interface OrderMergeInfoProps { }
 const payInfo = [
-  { title: '交付日期', name: 'deliverDate', render: (text) => formatTimeString(text) },
+  { title: '交付日期', name: 'deliverDate', render: (text) => formatTimeString(text, 'YYYY-MM-DD') },
   {
     title: '交付地址', name: 'address', render: (_, record) =>
       <div>
@@ -61,25 +62,25 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
         </div>
       }
     </div>, resetCol: {flex: '1 1 100%'} },
-    { title: '包装要求', name: 'pageRequire' },
-    { title: '其他要求', name: 'restsRequire' },
+    { title: '包装要求', name: 'requirement', render: (t, d) => d.requirement.detail?.pageRequire || '' },
+    { title: '其他要求', name: 'requirement', render: (t, d) => d.requirement.detail?.restsRequire || '' },
   ]
 
   return (
     <>
     <Row style={{ marginTop: 24 }} gutter={24}>
-      <Col span={data.orderModel > 30 ? 15: 12}>
+      <Col span={(data.orderKind === OrderKindType.SRM_ORDER) ? 15: 12}>
         <MellowCard title='交易信息' fullHeight>
           <RenderCard infoList={payInfo} dataSource={data.consignee} />
         </MellowCard>
       </Col>
-      <Col span={data.orderModel > 30 ? 9: 6}>
+      <Col span={(data.orderKind === OrderKindType.SRM_ORDER) ? 9: 6}>
         <MellowCard title='其他信息' fullHeight>
           <RenderCard infoList={otherInfo} dataSource={data} />
         </MellowCard>
       </Col>
       {
-        (data.orderModel > 30) ?
+        (data.orderKind === OrderKindType.SRM_ORDER) ?
         null
         :
         <Col span={6}>

src/pages/orderSystem/orderDetail/index.tsx

@@ -12,6 +12,7 @@ import OrderMergeInfo from './components/orderMergeInfo'
 import OrderTransformRecord from './components/orderTransformRecord'
 import OrderPayTabs from './components/orderPayTabs'
 import OrderDeleveRecord from './components/orderDeleveRecord'
+import { OrderKindType } from './constant'
 
 export interface CommonOrderDetailProps {}
 
@@ -95,7 +96,9 @@ const CommonOrderDetail:React.FC<CommonOrderDetailProps> = (props) => {
             <OrderProductTable/>
 
             {/* 支付信息 todo */}
-            <OrderPayTabs/>
+            {
+              formData.orderKind === OrderKindType.SRM_ORDER ? null : <OrderPayTabs/>
+            }
 
             {/* 杂项 */}
             <OrderMergeInfo/>