扫码出库和扫码入库功能开发

zhangwencui

2 天以前 95fce9ecb77e9615df925eee143ce34647c694ce

 src/pages/sales/salesAccount/index.vue

@@ -26,7 +26,8 @@
          v-if="ledgerList.length > 0">
      <view v-for="(item, index) in ledgerList"
            :key="index">
        <view class="ledger-item">
        <view class="ledger-item"
              @click="openOut(item)">
          <view class="item-header">
            <view class="item-left">
              <view class="document-icon">
@@ -66,6 +67,13 @@
              <text class="detail-label">签订日期</text>
              <text class="detail-value">{{ item.executionDate }}</text>
            </view>
            <view class="detail-row">
              <text class="detail-label">发货状态</text>
              <u-tag size="mini"
                     :type="getLedgerShippingTagType(item)">{{
                getLedgerShippingLabel(item)
              }}</u-tag>
            </view>
            <up-divider></up-divider>
            <view class="detail-info">
              <view class="detail-row">
@@ -80,25 +88,33 @@
            <up-divider></up-divider>
            <view class="detail-buttons">
              <u-button class="detail-button"
                      size="small"
                      type="primary"
                      @click.stop="handleInfo('edit', item)">
              编辑
            </u-button>
                        size="small"
                        type="primary"
                        plain
                        :disabled="!canLedgerShip(item)"
                        @click.stop="handleShip(item)">
                发货
              </u-button>
              <!-- <u-button class="detail-button"
                        size="small"
                        type="primary"
                        @click.stop="handleInfo('edit', item)">
                编辑
              </u-button>
              <u-button class="detail-button"
                      size="small"
                      type="primary"
                      plain
                      @click.stop="openOut(item)">
              发货状态
            </u-button>
            <u-button class="detail-button"
                      size="small"
                      type="error"
                      plain
                      @click.stop="handleDelete(item)">
              删除
            </u-button>
                        size="small"
                        type="primary"
                        plain
                        @click.stop="openOut(item)">
                发货状态
              </u-button> -->
              <!-- <u-button class="detail-button"
                        size="small"
                        type="error"
                        plain
                        @click.stop="handleDelete(item)">
                删除
              </u-button> -->
            </view>
          </view>
        </view>
@@ -109,12 +125,12 @@
      <text>暂无销售台账数据</text>
    </view>
    <!-- 浮动操作按钮 -->
    <view class="fab-button"
    <!-- <view class="fab-button"
          @click="handleInfo('add')">
      <up-icon name="plus"
               size="24"
               color="#ffffff"></up-icon>
    </view>
    </view> -->
  </view>
</template>

@@ -149,14 +165,168 @@
  const hasShippedProducts = products => {
    if (!products || products.length === 0) return false;
    return products.some(p => {
      const statusStr = (p.shippingStatus ?? "").toString();
      // 包含“发货”或有发货日期/车牌号视为已发货
      const statusCode = normalizeShippingStatusToCode(p.deliveryStatus ?? p.shippingStatus);
      const statusStr = (p.shippingStatus ?? "").toString().trim();
      // 有发货日期/车牌号，或状态明确为“已发货/发货完成”视为已发货
      return (
        statusStr.includes("发货") ||
        statusCode === 5 ||
        statusStr === "已发货" ||
        statusStr === "发货完成" ||
        statusStr === "已完成发货" ||
        !!p.shippingDate ||
        !!p.shippingCarNumber
      );
    });
  };

  // 台账发货状态：1-未发货，2-审批中，3-审批不通过，4-审批通过，5-已发货（与后端枚举对齐，兼容多种字段名）
  const LEDGER_SHIPPING_LABELS = {
    1: "未发货",
    2: "审批中",
    3: "审批不通过",
    4: "审批通过",
    5: "已发货",
  };

  const normalizeShippingStatusToCode = v => {
    if (v === null || v === undefined || v === "") return 1;
    const n = Number(v);
    if (!Number.isNaN(n) && n >= 1 && n <= 5) return n;
    const s = String(v).trim();
    const textMap = {
      未发货: 1,
      待发货: 1,
      审批中: 2,
      审核中: 2,
      待审核: 2,
      审批不通过: 3,
      审核拒绝: 3,
      审批通过: 4,
      审核通过: 4,
      已发货: 5,
      发货完成: 5,
      已完成发货: 5,
    };
    return textMap[s] ?? 1;
  };

  const getLedgerShippingStatusCode = item => {
    if (!item) return 1;
    const raw =
      item.deliveryStatus ??
      item.shippingApprovalStatus ??
      item.shipmentApproveStatus ??
      item.ledgerShippingStatus;
    if (raw !== null && raw !== undefined && raw !== "") {
      return normalizeShippingStatusToCode(raw);
    }
    if (item.shippingStatus !== null && item.shippingStatus !== undefined && item.shippingStatus !== "") {
      return normalizeShippingStatusToCode(item.shippingStatus);
    }
    return 1;
  };

  const getLedgerShippingLabel = item =>
    LEDGER_SHIPPING_LABELS[getLedgerShippingStatusCode(item)] ?? "未发货";

  const getLedgerShippingTagType = item => {
    const t = { 1: "info", 2: "warning", 3: "error", 4: "primary", 5: "success" };
    return t[getLedgerShippingStatusCode(item)] ?? "info";
  };

  const canLedgerShip = item => {
    const c = getLedgerShippingStatusCode(item);
    return c === 1 || c === 3;
  };

  /**
   * 判断是否可以发货
   * 只有在产品状态是充足，发货状态是待发货和审核拒绝的时候才可以发货
   * @param row 行数据
   */
  const canShip = row => {
    if (!row) return false;

    // 产品状态必须是充足（approveStatus === 1）
    if (row.approveStatus !== 1) return false;

    // 如果已发货（有发货日期或车牌号），不能再次发货
    if (row.shippingDate || row.shippingCarNumber) return false;

    // 如果后端返回了发货状态（deliveryStatus），已发货则禁止再次发货
    const deliveryStatus = row.deliveryStatus;
    if (deliveryStatus !== null && deliveryStatus !== undefined && String(deliveryStatus).trim() !== "") {
      const code = normalizeShippingStatusToCode(deliveryStatus);
      if (code === 5) return false;
    }

    // 发货状态必须是"待发货"或"审核拒绝"
    const statusStr = row.shippingStatus ? String(row.shippingStatus).trim() : "";
    return statusStr === "待发货" || statusStr === "审核拒绝";
  };

  const productLabel = row => {
    if (!row) return "产品";
    const parts = [row.productCategory, row.floorCode, row.specificationModel].filter(Boolean);
    return parts.length ? parts.join(" / ") : (row.productName || row.goodsName || "产品");
  };

  const handleShip = async item => {
    if (!canLedgerShip(item)) {
      uni.showToast({
        title: "仅未发货或审批不通过时可发货",
        icon: "none",
      });
      return;
    }
    if (!item?.id) return;
    showLoadingToast("加载中...");
    try {
      const res = await productList({ salesLedgerId: item.id, type: 1 });
      const products = res.data || res.records || [];
      closeToast();
      if (!products.length) {
        uni.showToast({
          title: "没有产品数据",
          icon: "none",
        });
        return;
      }

      // 先检查是否存在“不足”的产品：有一个不足就禁止发货并提示
      const insufficient = products.filter(p => p?.approveStatus !== 1);
      if (insufficient.length) {
        const names = insufficient.slice(0, 3).map(productLabel).join("、");
        uni.showToast({
          title: `存在库存不足产品：${names}${insufficient.length > 3 ? "…" : ""}`,
          icon: "none",
          duration: 2500,
        });
        return;
      }

      // 全部充足后，再筛选可发货产品（仅待发货/审核拒绝）
      const row = products.find(p => canShip(p));
      if (!row) {
        uni.showToast({
          title: "没有可发货的产品（仅待发货/审核拒绝可发货）",
          icon: "none",
          duration: 2500,
        });
        return;
      }

      uni.setStorageSync("goOutData", JSON.stringify(row));
      uni.navigateTo({
        url: "/pages/sales/salesAccount/goOut",
      });
    } catch (e) {
      closeToast();
      uni.showToast({
        title: "加载产品失败",
        icon: "none",
      });
    }
  };

  // 返回上一页
@@ -240,6 +410,7 @@
    try {
      // 设置操作类型
      uni.setStorageSync("operationType", type);
      uni.removeStorageSync("editData");

      // 如果是查看或编辑操作
      if (type !== "add") {