fix:

src/pages/transaction/components/orderHandDeleved/components/productTableCell/index.tsx

@@ -89,10 +89,10 @@ export const ProductTableCell:React.FC<ProductTableCellProps> = ({
             pattern: /^\d+(\.\d{1,3})?$/,
             message: `数量仅限三位小数`,
           },
-          {
-            min: 0,
-            message: `数量大于等于0`,
-          },
+          // {
+          //   min: 0,
+          //   message: `数量大于等于0`,
+          // },
         ]}
       >
         {chooseFormItem(formItem)}

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

@@ -107,7 +107,7 @@ const OrderMergeInfo: React.FC<OrderMergeInfoProps> = (props) => {
         <Col span={4} style={{fontSize: 12, color: "#909399"}}>纳税号：</Col><Col span={20}>{invoice?.taxNo}</Col>
         <Col span={4} style={{fontSize: 12, color: "#909399"}}>开户行：</Col><Col span={20}>{invoice?.bank}</Col>
         <Col span={4} style={{fontSize: 12, color: "#909399"}}>账号：</Col><Col span={20}>{invoice?.account}</Col>
-        <Col span={4} style={{fontSize: 12, color: "#909399"}}>地址：</Col><Col span={20}>{invoice?.addres}</Col>
+        <Col span={4} style={{fontSize: 12, color: "#909399"}}>地址：</Col><Col span={20}>{invoice?.address}</Col>
         <Col span={4} style={{fontSize: 12, color: "#909399"}}>电话：</Col><Col span={20}>{invoice?.phone}</Col>
       </Row>
     </Modal>

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

@@ -124,9 +124,9 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
     },
     {
       title: '商品名称',
-      dataIndex: 'productName',
+      dataIndex: 'name',
       align: 'center',
-      key: 'productName',
+      key: 'name',
     },
     {
       title: '品类',
@@ -148,50 +148,50 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
     },
     {
       title: creditsCommodity ? '兑换数量' : '采购数量',
-      dataIndex: 'purchaseCount',
+      dataIndex: 'quantity',
       align: 'center',
-      key: 'purchaseCount',
+      key: 'quantity',
     },
     {
       title: '发货数量',
-      dataIndex: 'deliverGoodsCount',
+      dataIndex: 'delivered',
       align: 'center',
-      key: 'deliverGoodsCount',
+      key: 'delivered',
     },
     {
-      title: '入库数量',
-      dataIndex: 'storageCount',
+      title: '收货数量',
+      dataIndex: 'received',
       align: 'center',
-      key: 'storageCount',
+      key: 'received',
     },
     {
       title: '差异数量',
-      dataIndex: 'differenceCount',
+      dataIndex: 'differCount',
       align: 'center',
-      key: 'differenceCount',
+      key: 'differCount',
     },
   ]
 
   const sideOrderCols: any[] = [
     {
       title: '发货批次',
-      dataIndex: 'deliveryBatch',
+      dataIndex: 'batchNo',
       align: 'center',
-      key: 'deliveryBatch'
+      key: 'batchNo'
     },
     {
       title: '发货单号',
       dataIndex: 'deliveryNo',
       align: 'center',
       key: 'deliveryNo',
-      render: text => <a target="blank" href={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?invoicesNo=${text}`}>{text}</a>
+      // render: text => <a target="blank" href={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?invoicesNo=${text}`}>{text}</a>
     },
     {
       title: '发货时间',
-      dataIndex: 'deliveryTime',
+      dataIndex: 'createTime',
       align: 'center',
-      key: 'deliveryTime',
-      render: text => formatTimeString(text)
+      key: 'createTime',
+      // render: text => formatTimeString(text)
     },
     {
       title: '物流单号',
@@ -202,29 +202,29 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
     },
     {
       title: '物流公司',
-      dataIndex: 'logisticsCompanyName',
+      dataIndex: 'company',
       align: 'center',
-      key: 'logisticsCompanyName'
+      key: 'company'
     },
     {
-      title: '入库单号',
-      dataIndex: 'storageNo',
+      title: '收货单号',
+      dataIndex: 'receiptNo',
       align: 'center',
-      key: 'storageNo',
+      key: 'receiptNo',
     },
     {
-      title: '入库时间',
-      dataIndex: 'storageTime',
+      title: '收货时间',
+      dataIndex: 'receiptTime',
       align: 'center',
-      key: 'storageTime',
-      render: text => formatTimeString(text)
+      key: 'receiptTime',
+      // render: text => formatTimeString(text)
     },
     {
       title: '内部状态',
-      dataIndex: 'interiorState',
+      dataIndex: 'innerStatusName',
       align: 'center',
-      key: 'interiorState',
-      render: text => <StatusColors type='deliveInside' status={text}/>
+      key: 'innerStatusName',
+      // render: text => <StatusColors type='deliveInside' status={text}/>
     },
     {
       title: '操作',
@@ -232,8 +232,8 @@ const OrderSaleRecord:React.FC<OrderSaleRecordProps> = (props) => {
       align: 'center',
       key: 'ctl',
       render: (text, record) => <>
-      { !isPreview && isReturn && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.CONFIRM_RECEIPT_ORDER && <Button type='link' disabled={disabled} onClick={() => handleReturn(record)}>确认回单</Button> }
-      { !isPreview && isDeleved && !dataRef.current.includes(record.id) && record.interiorState === DeliverySideState.ADD_LOGISTICS_ORDER &&  <Button type='link' disabled={disabled} onClick={() => handleConfirm(record)}>确认发货</Button> }
+      { !isPreview && isReturn && record.showReply && <Button type='link' disabled={disabled} onClick={() => handleReturn(record)}>确认回单</Button> }
+      { !isPreview && isDeleved && record.showDelivery && <Button type='link' disabled={disabled} onClick={() => handleConfirm(record)}>确认发货</Button> }
       </>
     },
   ]

src/pages/transaction/purchaseOrder/orderCollect/components/productModalTable/index.tsx

@@ -74,7 +74,8 @@ const orderProductShopTypeMaps = {
 
 export const AddressPop = (props) => {
   const { pickInfo = null, children } = props
-  return pickInfo && pickInfo.deliveryType === 2 ? <Space>
+  console.log(pickInfo)
+  return pickInfo && pickInfo.deliverType === 2 ? <Space>
     <EnvironmentOutlined style={{marginRight: 8}}/>
     <Popover content={
       <Row>

src/pages/transaction/saleOrder/readyConfirmDelevedOrder/model/useSelfTable.tsx

@@ -62,7 +62,7 @@ export const useSelfTable = () => {
       align: 'center',
       dataIndex: 'deliveryNo',
       key: 'deliveryNo',
-      render: (text, record) => <Link to={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`}>{text}</Link>
+      // render: (text, record) => <Link to={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.orderDeliveryDetailsId}&preview=1`}>{text}</Link>
     },
     {
       title: '订单类型',