Merge branch 'test' of 10.0.0.22:lingxi/lingxi-business-paltform into test

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

@@ -219,8 +219,8 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
       key: 'ctl',
       render: (text, record) => <>
       {/* todo 需根据内部状态判断显示哪个按钮 */}
-      { !isPreview && dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.CONFIRM_RECEIPT_ORDER && <Button type='link' onClick={() => handleReturn(record)}>确认回单</Button> }
-      { !isPreview && dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.WAREHOUSE_ORDER &&  <Button type='link' onClick={() => handleConfirm(record)}>确认收货</Button> }
+      { !isPreview && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.CONFIRM_RECEIPT_ORDER && <Button type='link' onClick={() => handleReturn(record)}>确认回单</Button> }
+      { !isPreview && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.WAREHOUSE_ORDER &&  <Button type='link' onClick={() => handleConfirm(record)}>确认收货</Button> }
       </>
     },
   ]

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

@@ -216,8 +216,8 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
       align: 'center',
       key: 'ctl',
       render: (text, record) => <>
-      { !isPreview && dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.CONFIRM_RECEIPT_ORDER && <Button type='link' onClick={() => handleReturn(record)}>确认回单</Button> }
-      { !isPreview && dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.ADD_LOGISTICS_ORDER &&  <Button type='link' onClick={() => handleConfirm(record)}>确认发货</Button> }
+      { !isPreview && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.CONFIRM_RECEIPT_ORDER && <Button type='link' onClick={() => handleReturn(record)}>确认回单</Button> }
+      { !isPreview && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.ADD_LOGISTICS_ORDER &&  <Button type='link' onClick={() => handleConfirm(record)}>确认发货</Button> }
       </>
     },
   ]