Merge branch 'dev_tide' into dev_tide_zlglxt_xinlan

zouyu

8 天以前 648003a577ef7a03046269c77fc5cc64199945e7

 src/views/inventoryManagement/receiptManagement/components/formDia.vue

@@ -196,7 +196,7 @@
const calculateTotalPrice = (row) => {
  const quantityStock = Number(row?.quantityStock ?? 0);
  const taxInclusiveUnitPrice = Number(row?.taxInclusiveUnitPrice ?? 0);
  

  if (Number.isFinite(quantityStock) && Number.isFinite(taxInclusiveUnitPrice)) {
    row.taxInclusiveTotalPrice = quantityStock * taxInclusiveUnitPrice;
  } else {
@@ -219,17 +219,13 @@
      productList.value = [];
      return
    }
    productList.value = productRes.data.map(item => {
      const quantityStock = Number(item?.quantity0 ?? 0);
      const taxInclusiveUnitPrice = Number(item?.taxInclusiveUnitPrice ?? 0);
      return {
        ...item,
        quantityStock,
        taxInclusiveUnitPrice,
        taxInclusiveTotalPrice: quantityStock * taxInclusiveUnitPrice,
        originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
      };
    })
    productList.value = productRes.data.map(item => ({
      ...item,
      quantityStock: 0,
      taxInclusiveUnitPrice: Number(item?.taxInclusiveUnitPrice ?? 0),
      taxInclusiveTotalPrice: 0,
      originalQuantityStock: Number(item.quantityStock ?? item.inboundQuantity ?? 0),
    }))
  } catch (error) {
    console.error('查询产品记录失败:', error)
    proxy.$modal.msgError('查询产品记录失败')
@@ -295,7 +291,8 @@
      details: selectedRows.value.map(product => ({
        id: product.id,
        inboundQuantity: Number(product.quantityStock),
            taxInclusiveUnitPrice: Number(product.taxInclusiveUnitPrice),
            unitPrice: Number(product.taxInclusiveUnitPrice),
        taxRate: Number(product.taxRate),
            taxInclusiveTotalPrice: Number(product.taxInclusiveTotalPrice)
      })),
    };
@@ -343,6 +340,9 @@
  return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
}

function getCurrentDate() {
  return formatDateTime(new Date(), false);
}

const openDialog = async (type, row) => {
  operationType.value = type