fix:

src/pages/transaction/components/orderMergeInfo/index.tsx

@@ -3,7 +3,7 @@ import { Row, Col, Tag, Modal } from 'antd'
 import MellowCard from '@/components/MellowCard'
 import { OrderDetailContext } from '../../_public/order/context'
 import { formatTimeString } from '@/utils'
-import { DELIVERY_TYPE } from '@/constants/order'
+import { DELIVERY_TYPE, OrderKindType } from '@/constants/order'
 import style from './index.less'
 import ContractList from '../ContractList'
 import cx from 'classnames'
@@ -56,29 +56,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 || '' },
   ]
 
-  if(data.orderModel > 30) {
-    otherInfo.shift()
-  }
-
   return (
     <>
     <Row style={{ marginTop: 24 }} gutter={24}>
-      <Col span={(data.externalStateName !== '不接受订单') || (data.orderModel > 30) ? 15 : 12}>
+      <Col span={(data.externalStateName !== '不接受订单') || (data.orderKind === OrderKindType.SRM_ORDER) ? 15 : 12}>
         <MellowCard title='交易信息' fullHeight>
           <RenderCard infoList={payInfo} dataSource={consignee} />
         </MellowCard>
       </Col>
-      <Col span={(data.externalStateName !== '不接受订单') || (data.orderModel > 30) ? 9: 6}>
+      <Col span={(data.externalStateName !== '不接受订单') || (data.orderKind === OrderKindType.SRM_ORDER) ? 9: 6}>
         <MellowCard title='其他信息' fullHeight>
           <RenderCard infoList={otherInfo} dataSource={data} />
         </MellowCard>
       </Col>
       {
-        (data.externalStateName !== '不接受订单') || (data.orderModel > 30) ?
+        (data.orderKind === OrderKindType.SRM_ORDER) || !data.hasContract ?
         null
         :
         <Col span={6}>

src/pages/transaction/purchaseOrder/index.tsx

@@ -117,7 +117,7 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
 
   const handleCancel = async (id) => {
     destoryRef.current.setVisible(true)
-    destroyActions.setFieldValue('id', id)
+    destroyActions.setFieldValue('orderId', id)
   }
 
    /** 参照后台数据生成 */
@@ -250,12 +250,12 @@ const PurchaseOrder: React.FC<PurchaseOrderProps> = (props) => {
               labelAlign: 'top',
             },
             properties: {
-              id: {
+              orderId: {
                 type: 'number',
                 title: '当前id',
                 visible: false,
               },
-              cancelReason: {
+              reason: {
                 type: 'textarea',
                 "x-component-props": {
                   rows: 4,