Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxia...

heshaofeng

6 天以前 375ace27ad6afbc3c83d92add0fb5a0347a6edbf

 ÏîÄ¿´úÂë/WIDESEA_WMSClient/src/extension/outbound/extend/NoStockOut.vue

@@ -5,29 +5,78 @@
      :lazy="true"
      width="65%"
      :padding="20"
      title="无库存出库"
      title="虚拟出入库"
      class="custom-vol-box"
    >
      <div>
        <!-- å•æ®è¾“入区域（支持扫码） -->
        <el-form 
          :inline="true" 
          :model="orderForm" 
          style="margin-bottom: 20px; align-items: flex-end;"
          @submit.prevent
        >
          <el-form-item label="出库单据:" name="outboundOrderNo">
            <el-input
              v-model="orderForm.outboundOrderNo"
              placeholder="请输入或扫描出库单据号"
              clearable
              style="width: 220px; margin-right: 10px;"
              @input="handleOutboundInput"
              @keyup.enter="(e) => {
                e.stopPropagation(); // é˜»æ­¢äº‹ä»¶å†’泡
                e.preventDefault(); // é˜»æ­¢é»˜è®¤è¡Œä¸º
                focusBarcodeInputDirectly();
              }"
              ref="outboundInputRef"
            ></el-input>
          </el-form-item>
          <el-form-item label="采购单据:" name="purchaseOrderNo">
            <el-input
              v-model="orderForm.purchaseOrderNo"
              placeholder="扫码条码后自动填充"
              clearable
              style="width: 220px; margin-right: 10px;"
              @input="handlePurchaseInput"
              readonly
              ref="purchaseInputRef"
            ></el-input>
          </el-form-item>
        </el-form>

        <!-- ä¸Šæ–¹è¾“入框 -->
        <el-form :inline="true" :model="formData" ref="formData" style="margin-bottom: 20px; align-items: flex-end;">
        <el-form 
          :inline="true" 
          :model="formData" 
          ref="formRef" 
          style="margin-bottom: 20px; align-items: flex-end;"
          @submit.prevent  
        >
          <el-form-item
            label="扫描条码:"
            style="width: 80%"
            prop="barcode"
            name="barcode"
            :rules="[{ required: true, message: '请扫描或输入条码', trigger: 'blur' }]"
          >
            <el-input
              ref="barcodeInput"
              ref="barcodeInputRef"
              v-model="formData.barcode"
              placeholder="请使用扫码枪扫描条码，或手动输入"
              @keyup.enter="handleScan"
              @keydown.enter="debouncedHandleScan" 
              autofocus
              class="custom-input"
              :disabled="!orderForm.outboundOrderNo || loading"
            ></el-input>
          </el-form-item>
          <el-form-item>
            <el-button type="primary" size="small" @click="handleScan" class="custom-button">
              <i class="el-icon-search"></i> ç¡®è®¤æ‰«æ
            <el-button 
              type="primary" 
              size="small" 
              @click="handleScan" 
              class="custom-button"
              :disabled="!orderForm.outboundOrderNo || loading"
            >
              <Search /> ç¡®è®¤æ‰«æ
            </el-button>
          </el-form-item>
        </el-form>
@@ -37,27 +86,23 @@
          <el-card shadow="hover" style="margin-bottom: 10px; border: none;" class="custom-card">
            <div class="card-header">
              <span class="header-title">已扫描条码列表（共{{ scannedBarcodes.length }}条）</span>
              <el-button
                class="clear-all-btn"
                @click="clearAll"
                :disabled="scannedBarcodes.length === 0"
              >清空所有</el-button>
            </div>
            <div class="card-body">
              <el-scrollbar height="400px" class="custom-scrollbar">
                <!-- ä½¿ç”¨ transition-group åŒ…裹以实现动画 -->
                <transition-group name="barcode-item-transition">
                  <div class="barcode-item" v-for="(barcode, index) in scannedBarcodes" :key="barcode" :data-index="index">
                    <span class="barcode-text">{{ index + 1 }}. {{ barcode }}</span>
                  <div class="barcode-item" v-for="(item, index) in scannedBarcodes" :key="item.barcode" :data-index="index">
                    <span class="barcode-text">{{ index + 1 }}. {{ item.barcode }}</span>
                    <el-button
                      class="delete-btn"
                      @click="removeItem(index)"
                    >删除</el-button>
                      @click="removeItem(index, item.barcode)"
                      icon="Delete"
                      circle
                      :disabled="loading"
                    ></el-button>
                  </div>
                </transition-group>
                <div class="empty-tip" v-if="scannedBarcodes.length === 0">
                  <i class="el-icon-information"></i>
                  <span>暂无扫描记录，请扫描条码</span>
                  <span>暂无扫描记录，请先输入出库单据后扫描条码</span>
                </div>
              </el-scrollbar>
            </div>
@@ -67,10 +112,26 @@

      <template #footer>
        <div class="footer-actions">
          <el-button type="primary" size="small" @click="submit" :disabled="scannedBarcodes.length === 0" class="submit-btn">
            <i class="el-icon-check"></i> æäº¤å‡ºåº“
          <el-button 
            type="primary" 
            size="small" 
            @click="submit" 
            :disabled="scannedBarcodes.length === 0 || !orderForm.outboundOrderNo || !orderForm.purchaseOrderNo || loading" 
            class="submit-btn"
          >
            <Check /> æäº¤å‡ºåº“
          </el-button>
          <el-button type="text" size="small" @click="showDetailBox = false" class="cancel-btn">
          <el-button 
            type="text" 
            size="small" 
            @click="(e) => {
              e.stopPropagation();
              e.preventDefault();
              showDetailBox = false;
            }" 
            class="cancel-btn" 
            :disabled="loading"
          >
            å–消
          </el-button>
        </div>
@@ -79,99 +140,261 @@
  </div>
</template>

<script>
<script setup>
import { ref, reactive, onMounted, nextTick, watch } from 'vue';
import { ElMessage } from 'element-plus';
import { Search, Check } from '@element-plus/icons-vue';

import VolBox from "@/components/basic/VolBox.vue";
import http from '@/api/http';

export default {
  components: { VolBox },
  data() {
    return {
      showDetailBox: false,
      formData: {
        barcode: "",
      },
      scannedBarcodes: [],
    };
  },
  methods: {
    open() {
      this.showDetailBox = true;
      this.scannedBarcodes = [];
      this.formData.barcode = "";
      this.$nextTick(() => {
        this.$refs.barcodeInput.focus();
      });
    },
// å“åº”式数据
const showDetailBox = ref(false);
const orderForm = reactive({
  outboundOrderNo: "",
  purchaseOrderNo: ""
});
const formData = reactive({
  barcode: "",
});
const scannedBarcodes = ref([]);
const loading = ref(false);
// æ–°å¢žï¼šå­˜å‚¨é¦–次扫描的采购单号（用于一致性校验）
const firstPurchaseOrderNo = ref(null);

    handleScan() {
      const barcode = this.formData.barcode.trim();
      if (!barcode) {
        this.$refs.barcodeInput.focus();
        return;
      }
      if (this.scannedBarcodes.includes(barcode)) {
        this.$message.warning(`条码 ${barcode} å·²æ‰«æè¿‡ï¼Œè¯·å‹¿é‡å¤æ‰«æ`);
        this.formData.barcode = "";
        this.$refs.barcodeInput.focus();
        return;
      }
// æ¨¡æ¿å¼•ç”¨
const formRef = ref(null);
const barcodeInputRef = ref(null);
const outboundInputRef = ref(null);
const purchaseInputRef = ref(null);

      this.scannedBarcodes.push(barcode);
      this.formData.barcode = "";
// ç»„件挂载时聚焦到出库单输入框
onMounted(() => {
  nextTick(() => {
    outboundInputRef.value?.focus();
  });
});

      this.$nextTick(() => {
        this.$refs.barcodeInput.focus();
      });
    },
// ç›‘听扫描列表，若为空则重置首次采购单号
watch(scannedBarcodes, (newVal) => {
  if (newVal.length === 0) {
    firstPurchaseOrderNo.value = null;
    orderForm.purchaseOrderNo = ""; // åŒæ­¥æ¸…空采购单输入框
  }
}, { deep: true });

    removeItem(index) {
      this.scannedBarcodes.splice(index, 1);
    },

    clearAll() {
      this.$confirm("确定要清空所有扫描记录吗？", "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      }).then(() => {
        this.scannedBarcodes = [];
      }).catch(() => {
        this.$refs.barcodeInput.focus();
      });
    },

    submit() {
      if (this.scannedBarcodes.length === 0) {
        this.$message.warning("请先扫描至少一条条码");
        this.$refs.barcodeInput.focus();
        return;
      }

      const params = {
        barcodes: this.scannedBarcodes,
      };

      this.http
        .post("/api/OutboundOrder/NoStockOut", params, "数据处理中...")
        .then((res) => {
          if (!res.status) {
            this.$message.error(res.message);
            this.$refs.barcodeInput.focus();
            return;
          }
          this.$message.success("出库成功");
          this.showDetailBox = false;
          this.$emit("parentCall", ($vue) => {
            $vue.refresh();
          });
        })
        .catch((err) => {
          this.$message.error(`请求失败：${err.message || "未知错误"}`);
          this.$refs.barcodeInput.focus();
        });
    },
  },
// ç®€å•é˜²æŠ–函数（无需依赖lodash）
const debounce = (fn, delay = 100) => {
  let timer = null;
  return (...args) => {
    if (timer) clearTimeout(timer);
    timer = setTimeout(() => {
      fn.apply(this, args);
    }, delay);
  };
};

// æ‰“开弹窗
const open = () => {
  showDetailBox.value = true;
  scannedBarcodes.value = [];
  formData.barcode = "";
  orderForm.outboundOrderNo = "";
  orderForm.purchaseOrderNo = "";
  // é‡ç½®é¦–次采购单号
  firstPurchaseOrderNo.value = null;
  nextTick(() => {
    outboundInputRef.value?.focus();
  });
};

// å‡ºåº“单输入处理（扫码或手动输入）
const handleOutboundInput = (value) => {
  if (value && value.trim()) {
    // å‡ºåº“单号格式验证逻辑（按需保留）
  }
};

// é‡‡è´­å•è¾“入处理（扫码或手动输入）
const handlePurchaseInput = (value) => {
  if (value && value.trim()) {
    // é‡‡è´­å•å·æ ¼å¼éªŒè¯é€»è¾‘（按需保留）
  }
};

// ç›´æŽ¥è·³è½¬åˆ°æ¡ç è¾“入框（无需先填采购单）
const focusBarcodeInputDirectly = () => {
  if (orderForm.outboundOrderNo.trim()) {
    barcodeInputRef.value?.focus();
  } else {
    ElMessage.warning("请先输入有效的出库单据号");
  }
};

/**
 * æ ¹æ®æ¡ç æŸ¥è¯¢é‡‡è´­å•æŽ¥å£ï¼ˆå®Œå…¨å¯¹é½ç¤ºä¾‹è¯·æ±‚格式）
 * @param {string} barcode æ¡ç 
 * @returns {Promise<string>} é‡‡è´­å•å·
 */
const getPurchaseOrderByBarcode = async (barcode) => {
  // å®Œå…¨æŒ‰ç…§ç¤ºä¾‹æ ¼å¼ï¼šurl拼接参数 + ç¬¬äºŒä¸ªå‚数传提示文本
  const res = await http.post(`/api/OutboundPicking/GetPurchaseOrderByBarcode?barCode=${encodeURIComponent(barcode)}`, "查询采购单中...");

  if (res.status !== true) {
    throw new Error(res.message || "查询采购单失败");
  }
  if (!res.data?.purchaseOrderNo) {
    throw new Error("未查询到该条码对应的采购单");
  }
  return res.data.purchaseOrderNo;
};

// æ‰«ææ¡ç æ ¸å¿ƒé€»è¾‘
const handleScan = async () => {
  if (!formRef.value) return;
  // éªŒè¯æ¡ç å¿…å¡«
  await formRef.value.validateField('barcode');

  const barcode = formData.barcode.trim();
  const outboundOrderNo = orderForm.outboundOrderNo.trim();

  // æ£€æŸ¥æ¡ç æ˜¯å¦å·²æ‰«æ
  if (scannedBarcodes.value.some(item => item.barcode === barcode)) {
    ElMessage.warning(`条码 ${barcode} å·²æ‰«æè¿‡ï¼Œè¯·å‹¿é‡å¤æ‰«æ`);
    formData.barcode = "";
    nextTick(() => barcodeInputRef.value?.focus());
    return;
  }

  try {
    loading.value = true;

    // æ­¥éª¤1：仅传条码查询采购单（使用示例格式的请求）
    const purchaseOrderNo = await getPurchaseOrderByBarcode(barcode);

    // æ ¸å¿ƒæ ¡éªŒï¼šé‡‡è´­å•ä¸€è‡´æ€§æ£€æŸ¥
    if (firstPurchaseOrderNo.value) {
      // éžé¦–次扫描，校验采购单号是否一致
      if (purchaseOrderNo !== firstPurchaseOrderNo.value) {
        throw new Error(`当前条码对应的采购单【${purchaseOrderNo}】与首次扫描的采购单【${firstPurchaseOrderNo.value}】不一致，禁止扫描！`);
      }
    } else {
      // é¦–次扫描，记录采购单号
      firstPurchaseOrderNo.value = purchaseOrderNo;
    }

    // èµ‹å€¼é‡‡è´­å•åˆ°è¾“入框
    orderForm.purchaseOrderNo = purchaseOrderNo;
    ElMessage.success(`成功查询到采购单：${purchaseOrderNo}`);

    // æ­¥éª¤2：调用原有条码验证接口（如需对齐格式可同步修改，此处保留原有格式）
    const validateRes = await http.post("/api/OutboundPicking/BarcodeValidate", {
      outOder: outboundOrderNo,
      inOder: purchaseOrderNo,
      barCode: barcode
    });

    if (validateRes.status === true) {
      scannedBarcodes.value.push({ barcode });
      ElMessage.success("扫描成功");
      formData.barcode = "";
    } else {
      ElMessage.error("扫描失败：" + (validateRes.message || '条码验证失败'));
    }
  } catch (error) {
    // æ•èŽ·é‡‡è´­å•ä¸ä¸€è‡´ç­‰é”™è¯¯å¹¶æç¤º
    ElMessage.error(error.message);
    // æ¸…空当前输入框，聚焦条码输入框
    formData.barcode = "";
    nextTick(() => barcodeInputRef.value?.focus());
  } finally {
    loading.value = false;
    // å¼ºåˆ¶èšç„¦æ¡ç è¾“入框，避免焦点跳到弹窗外
    nextTick(() => {
      if (barcodeInputRef.value) {
        barcodeInputRef.value.focus();
        // æ¸…空输入框选中状态（扫码枪可能残留选中）
        if (barcodeInputRef.value.input) {
          barcodeInputRef.value.input.select = () => {};
        }
      }
    });
  }
};

// å¸¦é˜²æŠ–和事件拦截的扫描处理（适配扫码枪）
const debouncedHandleScan = debounce(async (e) => {
  // é˜»æ­¢äº‹ä»¶å†’泡和默认行为
  e.stopPropagation();
  e.preventDefault();
  await handleScan();
}, 100);

// ç§»é™¤å•æ¡æ‰«æè®°å½•
const removeItem = async (index, barcode) => {
  try {
    loading.value = true;
    const res = await http.post("/api/OutboundPicking/DeleteBarcode", {
      outOder: orderForm.outboundOrderNo,
      inOder: orderForm.purchaseOrderNo,
      barCode: barcode
    });

    if (res.status === true) {
      scannedBarcodes.value.splice(index, 1);
      ElMessage.success("删除成功");
      // è‹¥åˆ é™¤åŽæ— æ¡ç ï¼Œè‡ªåŠ¨é‡ç½®é¦–次采购单号和采购单输入框
      if (scannedBarcodes.value.length === 0) {
        firstPurchaseOrderNo.value = null;
        orderForm.purchaseOrderNo = "";
      }
    } else {
      ElMessage.error("删除失败：" + (res.message || '删除失败'));
    }
  } catch (error) {
    ElMessage.error("删除条码异常：" + error.message);
  } finally {
    loading.value = false;
  }
};

// æäº¤å‡ºåº“
const submit = async () => {
  if (scannedBarcodes.value.length === 0) {
    ElMessage.warning("请先扫描至少一条条码");
    return;
  }

  const barcodes = scannedBarcodes.value.map(item => item.barcode);

  try {
    loading.value = true;
    const res = await http.post("/api/OutboundPicking/NoStockOutSubmit", {
      OutOderSubmit: orderForm.outboundOrderNo,
      InOderSubmit: orderForm.purchaseOrderNo,
      BarCodeSubmit: barcodes
    });

    if (res.status === true) {
      ElMessage.success("出库提交成功");
      showDetailBox.value = false;
      // æäº¤æˆåŠŸåŽé‡ç½®çŠ¶æ€
      firstPurchaseOrderNo.value = null;
      scannedBarcodes.value = [];
    } else {
      ElMessage.error("出库提交失败：" + (res.message || '提交失败'));
    }
  } catch (error) {
    ElMessage.error("出库提交异常：" + error.message);
  } finally {
    loading.value = false;
  }
};

// æš´éœ²ç»™çˆ¶ç»„件的方法
defineExpose({
  open
});
</script>

<style scoped>
@@ -219,31 +442,22 @@
  font-size: 15px;
  color: #333;
}
.clear-all-btn {
  color: #f56c6c;
  font-size: 13px;
  transition: color 0.2s;
}
.clear-all-btn:hover {
  color: #e53e3e;
  background: rgba(245, 108, 108, 0.1);
}

.card-body {
  padding: 0;
}

/* è‡ªå®šä¹‰æ»šåŠ¨æ¡ */
.custom-scrollbar ::v-deep .el-scrollbar__thumb {
.custom-scrollbar :deep(.el-scrollbar__thumb) {
  background: rgba(0, 0, 0, 0.2);
  border-radius: 4px;
  width: 4px;
}
.custom-scrollbar ::v-deep .el-scrollbar__bar:hover .el-scrollbar__thumb {
.custom-scrollbar :deep(.el-scrollbar__bar:hover .el-scrollbar__thumb) {
  background: rgba(0, 0, 0, 0.3);
  width: 6px;
}
.custom-scrollbar ::v-deep .el-scrollbar__wrap {
.custom-scrollbar :deep(.el-scrollbar__wrap) {
  overflow-x: hidden;
}

@@ -260,7 +474,7 @@
}
/* ä¸ºå¥‡æ•°è¡Œæ·»åŠ è½»å¾®çš„背景色，增强可读性 */
.barcode-item:nth-child(odd) {
  background-color: #e1e1e1;
  background-color: #f9f9f9;
}
.barcode-text {
  flex: 1;
@@ -274,16 +488,15 @@

.delete-btn {
  color: #ea1919;
  font-size: 20px;
  font-size: 16px;
  transition: all 0.2s;
  transform: scale(0.8);
  opacity: 0.7;
}
.barcode-item:hover .delete-btn {
  opacity: 1;
  transform: scale(1);
}
.delete-btn:hover {
  color: #f56c6c !important; /* ä½¿ç”¨ !important è¦†ç›– Element UI é»˜è®¤æ ·å¼ */
  color: #f56c6c !important;
  background: rgba(245, 108, 108, 0.1);
}

@@ -296,22 +509,22 @@
  flex-direction: column;
  align-items: center;
  justify-content: center;
  gap: 15px;
}
.empty-tip i {
  font-size: 40px;
  margin-bottom: 15px;
  color: #dcdfe6;
}

/* è‡ªå®šä¹‰è¾“入框 */
.custom-input ::v-deep .el-input__inner {
.custom-input :deep(.el-input__inner) {
  border-radius: 6px;
  border-color: #e4e7ed;
  transition: all 0.3s;
  height: 36px;
  line-height: 36px;
}
.custom-input ::v-deep .el-input__inner:focus {
.custom-input :deep(.el-input__inner:focus) {
  border-color: #409eff;
  box-shadow: 0 0 0 3px rgba(64, 158, 255, 0.1);
}
@@ -355,7 +568,7 @@
</style>

<style>
/* ... (全局样式部分保持不变) ... */
/* å…¨å±€æ ·å¼éƒ¨åˆ†ä¿æŒä¸å˜ */
.text-button:hover {
  background-color: #f0f9eb !important;
}