fix：处理销售订单确认回单和继续发货按钮显示异常

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

@@ -25,11 +25,12 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
   const isDeleved = pathname.indexOf('readyConfirmDelevedOrder') !== -1
   // 是否是确认回单页
   const isReturn = pathname.indexOf('readyConfirmReturnOrder') !== -1
+  console.log(isPreview, isDeleved, isReturn)
 
   // 用于储存已经修改过的订单id
   const dataRef = useRef<any>([])
   const { data, reloadFormData } = useContext(OrderDetailContext)
-  const { orderReceivingStatisticsResponses, orderDeliveryDetailsResponses, orderModel } = data
+  const { orderReceivingStatisticsResponses, orderDeliveryDetailsResponses, orderModel, externalState } = data
   const creditsCommodity = (orderModel === 24 || orderModel === 25) // 积分或渠道积分下单模式
 
   const outOrderCols: any[] = [
@@ -113,8 +114,8 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
       key: 'differenceCount',
     },
   ]
-  
-  
+
+
   const sideChildrenCols: any[] = [
     {
       title: '商品ID',
@@ -341,10 +342,13 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
                 childrenDataKey='orderDeliveryProducts'
                 dataSource={orderDeliveryDetailsResponses}
               />
-              <Space style={{marginTop: 18, display: "flex", justifyContent: "flex-end"}}>
-                <Button type="primary" onClick={handelReciveReturnOrder}>确认本单全部发货单已收到回单</Button>
-                <Button type="primary" onClick={handleContinueDeliver}>继续发货</Button>
-              </Space>
+              {
+                externalState === 11 && !isPreview && isReturn &&
+                <Space style={{marginTop: 18, display: "flex", justifyContent: "flex-end"}}>
+                  <Button type="primary" onClick={handelReciveReturnOrder}>确认本单全部发货单已收到回单</Button>
+                  <Button type="primary" onClick={handleContinueDeliver}>继续发货</Button>
+                </Space>
+              }
             </Tabs.TabPane>
           }
         </Tabs>
@@ -356,4 +360,4 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
 
 OrderSaleRecord.defaultProps = {}
 
-export default OrderSaleRecord
\ No newline at end of file
+export default OrderSaleRecord

src/pages/transaction/purchaseOrder/orderCollect/constant/index.tsx

@@ -277,15 +277,11 @@ export const productInfoColumns: any[] = [
     align: 'left',
     key: 'unitPrice',
     render: (t, r) => {
-      // if(r?.commodityId) {
-      //   return <PriceComp priceSection={r.unitPrice}/>
-      // } else  {
-      //   return r.price
-      // }
-      if(JSON.stringify(r.unitPrice) === '{}') {
-        return r.price
-      } else  {
+      // todo 还差需求报价的商品数据字段对比
+      if(r?.commodityId) {
         return <PriceComp priceSection={r.unitPrice}/>
+      } else  {
+        return <span style={{color: 'red'}}>￥ {r.price}</span>
       }
     }
   },