Merge branch 'refs/heads/dev_NEW_pro' into dev_宁夏_铭远环保

liding

2026-06-24 ec226b03fbd26bc178137ad20d7bd030ef2c5c8b

 src/views/salesManagement/salesLedger/index.vue

@@ -153,6 +153,7 @@
                </template>
              </el-table-column>
              <el-table-column label="数量" prop="quantity" />
              <el-table-column label="退货数量" prop="returnQuantity" />
              <el-table-column label="待发货数量" prop="noQuantity" />
              <el-table-column label="税率(%)" prop="taxRate" />
              <el-table-column
@@ -219,6 +220,13 @@
        <el-table-column
          label="合同金额(元)"
          prop="contractAmount"
          width="220"
          show-overflow-tooltip
          :formatter="formattedNumber"
        />
        <el-table-column
          label="实际合同金额(元)"
          prop="netContractAmount"
          width="220"
          show-overflow-tooltip
          :formatter="formattedNumber"
@@ -2857,6 +2865,12 @@
    return;
  }

  // 审批中时提示用户已有待审批的发货记录
  const statusStr = row.shippingStatus ? String(row.shippingStatus).trim() : "";
  if (statusStr === "审批中") {
    proxy.$modal.msgWarning("该产品存在待审批的发货记录，请注意避免重复提交");
  }

  currentDeliveryRow.value = row;
  const batchNoList = await getDeliveryBatchNoList(
    row.productModelId || row.modelId
@@ -3187,4 +3201,4 @@
    page-break-after: avoid;
  }
}
</style>
</style>