fix: 含税总价计算错误

gongchunyi

8 天以前 d336a25aae76f8baf8a8a5dfce18521b9a7d0f03

 src/views/salesManagement/salesLedger/index.vue

@@ -35,30 +35,30 @@
          :bound-route-name="processFlowSelectBoundRouteName"
          @confirm="handleProcessFlowSelectConfirm"
        />
        <div>
          <el-button type="primary" @click="openForm('add')">
            新增台账
          </el-button>
        <el-button type="primary"  @click="handleBulkDelivery">
            发货
          </el-button>
          <el-button type="primary" plain @click="handleImport">导入</el-button>
          <el-button @click="handleOut">导出</el-button>
          <el-button type="danger" plain @click="handleDelete">删除</el-button>
          <el-dropdown @command="handlePrintCommand">
            <el-button type="primary" plain>
              打印单据<el-icon class="el-icon--right"><ArrowDown /></el-icon>
            </el-button>
            <template #dropdown>
              <el-dropdown-menu>
                <el-dropdown-item command="finishedProcessCard">生产流程卡（成品）</el-dropdown-item>
                <el-dropdown-item command="salesOrder">销售订单</el-dropdown-item>
                <el-dropdown-item command="salesDeliveryNote">销售发货单</el-dropdown-item>
              </el-dropdown-menu>
            </template>
          </el-dropdown>
          <el-button type="primary" plain @click="handlePrintLabel">打印标签</el-button>
        </div>
         <el-space wrap>
               <el-button type="primary" @click="openForm('add')">新增台账</el-button>
               <el-button type="primary" @click="handleBulkDelivery">发货</el-button>
               <el-button type="primary" plain @click="handleImport">导入</el-button>
               <el-button @click="handleOut">导出</el-button>

               <el-button type="danger" plain @click="handleDelete">删除</el-button>

               <el-dropdown @command="handlePrintCommand">
                  <el-button type="primary" plain>
                     打印单据<el-icon class="el-icon--right">
                        <ArrowDown />
                     </el-icon>
                  </el-button>
                  <template #dropdown>
                     <el-dropdown-menu>
                        <el-dropdown-item command="finishedProcessCard">生产流程卡（成品）</el-dropdown-item>
                        <el-dropdown-item command="salesOrder">销售订单</el-dropdown-item>
                        <el-dropdown-item command="salesDeliveryNote">销售发货单</el-dropdown-item>
                     </el-dropdown-menu>
                  </template>
               </el-dropdown>
               <el-button type="primary" plain @click="handlePrintLabel">打印标签</el-button>
            </el-space>
      </div>
      <el-table :data="tableData" border v-loading="tableLoading" @selection-change="handleSelectionChange"
        :expand-row-keys="expandedRowKeys" :row-key="(row) => row.id" :row-class-name="tableRowClassName" show-summary style="width: 100%"
@@ -580,7 +580,7 @@
                        style="width: 100%"
                        placeholder="请输入"
                        clearable
                        @change="recalcAreaTotals"
                        @change="() => { recalcAreaTotals(); calculateFromUnitPrice(true); }"
                     />
                  </el-form-item>
               </el-col>
@@ -1649,8 +1649,9 @@
   productData.value = products.map((p) => {
      const quantity = Number(p.quantity ?? 0) || 0;
      const unitPrice = Number(p.unitPrice ?? 0) || 0;
      const settlePieceArea = Number(p.settlePieceArea ?? 0) || 1;
      const taxRate = "13"; // 默认 13%，便于直接提交（如需可在产品中自行修改）
      const taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
      const taxInclusiveTotalPrice = (unitPrice * settlePieceArea * quantity).toFixed(2);
      const taxExclusiveTotalPrice = proxy.calculateTaxExclusiveTotalPrice(taxInclusiveTotalPrice, taxRate);
      return {
         // 台账字段
@@ -2153,10 +2154,11 @@
   if (!productForm.value.quantity) {
      return;
   }
   // 含税总价计算
   const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;
   // 含税总价计算 = 单价 * 结算面积 * 数量
   productForm.value.taxInclusiveTotalPrice =
      proxy.calculateTaxIncludeTotalPrice(
         productForm.value.taxInclusiveUnitPrice,
         productForm.value.taxInclusiveUnitPrice * settlePieceArea,
         productForm.value.quantity
      );
   if (productForm.value.taxRate) {
@@ -2219,15 +2221,12 @@
   const computed = Number(computedPieceArea.toFixed(5));

   productForm.value.actualPieceArea = computed;

   // settlePieceArea：若用户未填写/为0，则默认使用宽高计算值
   const settlePieceRaw = Number(productForm.value.settlePieceArea ?? 0) || 0;
   if (!settlePieceRaw) {
      productForm.value.settlePieceArea = computed;
   }
   productForm.value.settlePieceArea = computed;

   recalcPerimeterFromWidthHeight();
   recalcAreaTotals();
   // 面积更新后，重新计算含税总价 = 单价 * 结算面积 * 数量
   calculateFromUnitPrice(true);
};

// 根据含税总价计算含税单价和数量
@@ -2294,19 +2293,20 @@
      return;
   }
   if (isCalculating.value) return;
	

   const quantity = parseFloat(productForm.value.quantity);
   const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
	
   const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;

   if (!quantity || quantity <= 0 || !unitPrice) {
      return;
   }
	

   isCalculating.value = true;
	
   // 计算含税总价
   productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
	

   // 计算含税总价 = 单价 * 结算面积 * 数量
   productForm.value.taxInclusiveTotalPrice = (unitPrice * settlePieceArea * quantity).toFixed(2);

   // 如果有税率，计算不含税总价
   if (productForm.value.taxRate) {
      productForm.value.taxExclusiveTotalPrice =
@@ -2315,30 +2315,31 @@
            productForm.value.taxRate
         );
   }
	

   isCalculating.value = false;
};

// 根据含税单价变化计算总价
const calculateFromUnitPrice = () => {
const calculateFromUnitPrice = (silent = false) => {
   if (!productForm.value.taxRate) {
      proxy.$modal.msgWarning("请先选择税率");
      if (!silent) proxy.$modal.msgWarning("请先选择税率");
      return;
   }
   if (isCalculating.value) return;
	

   const quantity = parseFloat(productForm.value.quantity);
   const unitPrice = parseFloat(productForm.value.taxInclusiveUnitPrice);
	
   const settlePieceArea = parseFloat(productForm.value.settlePieceArea) || 1;

   if (!quantity || quantity <= 0 || !unitPrice) {
      return;
   }
	

   isCalculating.value = true;
	
   // 计算含税总价
   productForm.value.taxInclusiveTotalPrice = (unitPrice * quantity).toFixed(2);
	

   // 计算含税总价 = 单价 * 结算面积 * 数量
   productForm.value.taxInclusiveTotalPrice = (unitPrice * settlePieceArea * quantity).toFixed(2);

   // 如果有税率，计算不含税总价
   if (productForm.value.taxRate) {
      productForm.value.taxExclusiveTotalPrice =
@@ -2347,7 +2348,7 @@
            productForm.value.taxRate
         );
   }
	

   isCalculating.value = false;
};