Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_pro_河南鹤壁

yuan

2026-06-12 7726b6cdab80596d2e2f7dd3fe1ec3dfbdeee155

 src/views/salesManagement/salesLedger/index.vue

@@ -161,7 +161,7 @@
                               prop="taxRate" />
              <el-table-column label="含税单价(元)"
                               prop="taxInclusiveUnitPrice"
                               :formatter="sensitiveUnitPriceFormatter" />
                               :formatter="sensitiveAmountFormatter" />
              <el-table-column label="含税总价(元)"
                               prop="taxInclusiveTotalPrice"
                               :formatter="sensitiveAmountFormatter" />
@@ -455,8 +455,8 @@
          <el-table-column label="税率(%)"
                           prop="taxRate" />
          <el-table-column label="含税单价(元)"
                            prop="taxInclusiveUnitPrice"
                            :formatter="unitPriceFormatter" />
                           prop="taxInclusiveUnitPrice"
                           :formatter="formattedNumber" />
          <el-table-column label="含税总价(元)"
                           prop="taxInclusiveTotalPrice"
                           :formatter="formattedNumber" />
@@ -668,7 +668,7 @@
                               :min="0"
                               v-model="productForm.taxInclusiveUnitPrice"
                               style="width: 100%"
                               :precision="6"
                               :precision="2"
                               placeholder="请输入"
                               clearable
                               @change="calculateFromUnitPrice" />
@@ -722,7 +722,7 @@
              </el-select>
            </el-form-item>
          </el-col>
          <el-col :span="12">
<!--          <el-col :span="12">
            <el-form-item label="是否生产："
                          prop="isProduction">
              <el-radio-group v-model="productForm.isProduction">
@@ -732,7 +732,7 @@
                          :value="false" />
              </el-radio-group>
            </el-form-item>
          </el-col>
          </el-col>-->
        </el-row>
      </el-form>
    </FormDialog>
@@ -1402,12 +1402,6 @@
    }
    return parseFloat(cellValue).toFixed(2);
  };
  const unitPriceFormatter = (row, column, cellValue) => {
    if (cellValue === undefined || cellValue === null || cellValue === "") {
      return "0.000000";
    }
    return parseFloat(cellValue).toFixed(6);
  };
  const findLedgerRecordByRow = row => {
    if (!row) return null;
    if (
@@ -1460,12 +1454,6 @@
      return "*****";
    }
    return formattedNumber(row, column, cellValue);
  };
  const sensitiveUnitPriceFormatter = (row, column, cellValue) => {
    if (!isCurrentUserMaintainer(row)) {
      return "*****";
    }
    return unitPriceFormatter(row, column, cellValue);
  };
  // 获取tree子数据
  const getModels = value => {
@@ -1746,7 +1734,7 @@
        unit: p.unit || "",
        quantity: quantity,
        taxRate: taxRate,
        taxInclusiveUnitPrice: unitPrice.toFixed(6),
        taxInclusiveUnitPrice: unitPrice.toFixed(2),
        taxInclusiveTotalPrice: taxInclusiveTotalPrice,
        taxExclusiveTotalPrice: taxExclusiveTotalPrice,
        invoiceType: "增普票",
@@ -2478,7 +2466,7 @@
    isCalculating.value = true;

    // 计算含税单价 = 含税总价 / 数量
    productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(6);
    productForm.value.taxInclusiveUnitPrice = (totalPrice / quantity).toFixed(2);

    // 如果有税率，计算不含税总价
    if (productForm.value.taxRate) {
@@ -2520,7 +2508,7 @@
    // 计算含税单价 = 含税总价 / 数量
    productForm.value.taxInclusiveUnitPrice = (
      inclusiveTotalPrice / quantity
    ).toFixed(6);
    ).toFixed(2);

    isCalculating.value = false;
  };