Merge branch 'dev_河南_鹤壁天沐玻璃厂' of http://114.132.189.42:9002/r/product-inven...

gongchunyi

昨天 4853f7c8e01ccbeae80e0243b632efc360067df8

 src/views/salesManagement/salesLedger/index.vue

@@ -225,9 +225,9 @@
                  <el-tag v-else-if="scope.row.productStockStatus == 2"
                          type="success">已入库</el-tag>
                  <el-tag v-else-if="scope.row.productStockStatus == 0"
                          type="info">未出库</el-tag>
                          type="info">未入库</el-tag>
                  <el-tag v-else
                          type="danger">不足</el-tag>
                          type="danger">未入库</el-tag>
                </template>
              </el-table-column>
              <!-- <el-table-column label="发货状态" width="140" align="center">
@@ -666,12 +666,12 @@
                               v-model="scope.row.settlePieceArea"
                               :min="0"
                               :step="1"
                               :precision="10"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable
                               @change="() => handleInlineSettleAreaChange(scope.row)" />
              <span v-else>{{ scope.row.settlePieceArea ?? "" }}</span>
              <span v-else>{{ scope.row.settlePieceArea ? Number(scope.row.settlePieceArea).toFixed(4) : "" }}</span>
            </template>
          </el-table-column>
          <el-table-column label="数量"
@@ -701,10 +701,10 @@
                               v-model="scope.row.actualTotalArea"
                               :min="0"
                               :step="1"
                               :precision="10"
                               :precision="4"
                               style="width: 100%"
                               placeholder="自动计算" />
              <span v-else>{{ scope.row.actualTotalArea ?? "" }}</span>
              <span v-else>{{ scope.row.actualTotalArea ? Number(scope.row.actualTotalArea).toFixed(4) : "" }}</span>
            </template>
          </el-table-column>
          <el-table-column label="含税单价(元)"
@@ -1341,8 +1341,8 @@
                          prop="actualPieceArea">
              <el-input-number v-model="productForm.actualPieceArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="0.0001"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable
@@ -1354,8 +1354,8 @@
                          prop="actualTotalArea">
              <el-input-number v-model="productForm.actualTotalArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="0.0001"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable />
@@ -1366,8 +1366,8 @@
                          prop="settlePieceArea">
              <el-input-number v-model="productForm.settlePieceArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="0.0001"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable
@@ -1379,8 +1379,8 @@
                          prop="settleTotalArea">
              <el-input-number v-model="productForm.settleTotalArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="0.0001"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable />
@@ -1391,8 +1391,8 @@
                          prop="settleTotalArea">
              <el-input-number v-model="productForm.settleTotalArea"
                               :min="0"
                               :step="0.00001"
                               :precision="5"
                               :step="0.0001"
                               :precision="4"
                               style="width: 100%"
                               placeholder="请输入"
                               clearable />
@@ -1815,7 +1815,11 @@

  const buildLedgerQrCompositeDataUrl = row =>
    new Promise((resolve, reject) => {
      const payload = JSON.stringify({ id: row.id });
      const payload = JSON.stringify({
        id: row.id,
        salesContractNo: (row.salesContractNo ?? "").trim(),
        type: "XS",
      });
      QRCode.toDataURL(payload, { width: 220, margin: 2 })
        .then(qrDataUrl => {
          const contract = (row.salesContractNo ?? "").trim() || "—";
@@ -1885,7 +1889,7 @@
    if (!ledgerQrCompositeUrl.value) return;
    const a = document.createElement("a");
    a.href = ledgerQrCompositeUrl.value;
    a.download = `销售销售订单二维码-${ledgerQrDownloadBaseName.value}.png`;
    a.download = `销售台账二维码-${ledgerQrDownloadBaseName.value}.png`;
    a.click();
  };

@@ -2837,7 +2841,7 @@
      const res = await productList({ salesLedgerId: id, type: 1 });
      stockProductList.value = [];
      stockProductList.value =
        res.data.filter(item => item.productStockStatus == 0) || [];
        res.data.filter(item => item.productStockStatus == 0 || item.productStockStatus == 1) || [];
    } catch (e) {
      proxy?.$modal?.msgError?.("获取产品列表失败");
    } finally {
@@ -3776,6 +3780,13 @@
      } else {
        const res = await getProcessCard(selectedId);
        const processCardData = res?.data ?? {};
        // 补齐二维码所需的台账标识（后端数据有时不带 id）
        if (processCardData && typeof processCardData === "object") {
          processCardData.salesLedgerId = processCardData.salesLedgerId ?? selectedId;
          processCardData.salesContractNo =
            (processCardData.salesContractNo ?? "").trim() ||
            String(selectedRow?.salesContractNo ?? "").trim();
        }
        const routeNodes = processCardData?.routeNodes;
        const isProcessRouteEmpty =
          !Array.isArray(routeNodes) || routeNodes.length === 0;
@@ -3794,9 +3805,9 @@
          } catch {
            return;
          }
          printFinishedProcessCard(processCardData);
          await printFinishedProcessCard(processCardData);
        } else {
          printFinishedProcessCard(processCardData);
          await printFinishedProcessCard(processCardData);
        }
      }
    } catch (error) {
@@ -4213,6 +4224,40 @@
    return statusStr === "待发货" || statusStr === "审核拒绝";
  };

  const getLedgerDisplayName = ledger =>
    String(ledger?.salesContractNo || "").trim() ||
    String(ledger?.projectName || "").trim() ||
    `ID:${ledger?.id ?? "-"}`;

  const validateLedgersStockedBeforeDelivery = async ledgers => {
    const invalidLedgers = [];
    for (const ledger of ledgers || []) {
      const ledgerId = ledger?.id;
      const ledgerName = getLedgerDisplayName(ledger);
      if (!ledgerId) {
        invalidLedgers.push(`${ledgerName}(缺少台账ID)`);
        continue;
      }
      let products = [];
      try {
        const res = await productList({ salesLedgerId: ledgerId, type: 1 });
        products = Array.isArray(res?.data) ? res.data : [];
      } catch (e) {
        invalidLedgers.push(`${ledgerName}(明细加载失败)`);
        continue;
      }
      const unstockedProducts = products.filter(
        item => Number(item?.productStockStatus) !== 2
      );
      if (unstockedProducts.length > 0) {
        invalidLedgers.push(
          `${ledgerName}(未全部入库${unstockedProducts.length}条)`
        );
      }
    }
    return invalidLedgers;
  };

  const handleBulkDelivery = async () => {
    if (selectedRows.value.length === 0) {
      proxy.$modal.msgWarning("请选择数据");
@@ -4221,7 +4266,7 @@

    // 只允许【未发货/审批失败】进入发货流程
    const statusItem = selectedRows.value[0].deliveryStatus;
    const isTrue = true;
    let isTrue = true;
    selectedRows.value.forEach(row => {
      if (row.deliveryStatus != 1 && row.deliveryStatus != 3) {
        proxy.$modal.msgWarning("仅未发货或审批失败的台账可以发货");
@@ -4235,6 +4280,29 @@
      }
    });
    if (!isTrue) {
      return;
    }

    proxy.$modal.loading("正在校验明细入库状态，请稍候...");
    const invalidLedgers = await validateLedgersStockedBeforeDelivery(
      selectedRows.value
    );
    proxy.$modal.closeLoading();
    if (invalidLedgers.length > 0) {
      try {
        await ElMessageBox.alert(
          `以下销售台账存在未全部入库的明细，暂不可发货：\n${invalidLedgers.join(
            "\n"
          )}`,
          "提示",
          {
            type: "warning",
            confirmButtonText: "知道了",
          }
        );
      } catch {
        /* 关闭弹窗 */
      }
      return;
    }

@@ -4354,7 +4422,7 @@
  };

  // 打开发货弹框（单条）
  const openDeliveryForm = row => {
  const openDeliveryForm = async row => {
    // 只允许【未发货/审批失败】发货；已发货/审批中不允许
    const status = Number(row.deliveryStatus);
    if (status !== 1 && status !== 3) {
@@ -4362,6 +4430,25 @@
      return;
    }

    proxy.$modal.loading("正在校验明细入库状态，请稍候...");
    const invalidLedgers = await validateLedgersStockedBeforeDelivery([row]);
    proxy.$modal.closeLoading();
    if (invalidLedgers.length > 0) {
      try {
        await ElMessageBox.alert(
          `当前销售台账存在未全部入库的明细，暂不可发货：\n${invalidLedgers[0]}`,
          "提示",
          {
            type: "warning",
            confirmButtonText: "知道了",
          }
        );
      } catch {
        /* 关闭弹窗 */
      }
      return;
    }

    currentDeliveryRows.value = [row];
    deliveryForm.value = {
      type: "货车",