代码优化

647556386

7 天以前 f29f358f589f5b1c2589c07b65845650be7aafef

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

@@ -10,7 +10,12 @@
    >
      <div>
        <!-- å•æ®è¾“入区域（支持扫码） -->
        <el-form :inline="true" :model="orderForm" style="margin-bottom: 20px; align-items: flex-end;">
        <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"
@@ -18,25 +23,35 @@
              clearable
              style="width: 220px; margin-right: 10px;"
              @input="handleOutboundInput"
              @keyup.enter="focusPurchaseInput"
              @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="请输入或扫描采购单据号"
              placeholder="扫码条码后自动填充"
              clearable
              style="width: 220px; margin-right: 10px;"
              @input="handlePurchaseInput"
              @keyup.enter="focusBarcodeInput"
              readonly
              ref="purchaseInputRef"
            ></el-input>
          </el-form-item>
        </el-form>

        <!-- ä¸Šæ–¹è¾“入框 -->
        <el-form :inline="true" :model="formData" ref="formRef" 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%"
@@ -47,10 +62,10 @@
              ref="barcodeInputRef"
              v-model="formData.barcode"
              placeholder="请使用扫码枪扫描条码，或手动输入"
              @keyup.enter="handleScan"
              @keydown.enter="debouncedHandleScan" 
              autofocus
              class="custom-input"
              :disabled="!orderForm.outboundOrderNo || !orderForm.purchaseOrderNo"
              :disabled="!orderForm.outboundOrderNo || loading"
            ></el-input>
          </el-form-item>
          <el-form-item>
@@ -59,7 +74,7 @@
              size="small" 
              @click="handleScan" 
              class="custom-button"
              :disabled="!orderForm.outboundOrderNo || !orderForm.purchaseOrderNo || loading"
              :disabled="!orderForm.outboundOrderNo || loading"
            >
              <Search /> ç¡®è®¤æ‰«æ
            </el-button>
@@ -87,7 +102,7 @@
                  </div>
                </transition-group>
                <div class="empty-tip" v-if="scannedBarcodes.length === 0">
                  <span>暂无扫描记录，请先输入单据后扫描条码</span>
                  <span>暂无扫描记录，请先输入出库单据后扫描条码</span>
                </div>
              </el-scrollbar>
            </div>
@@ -106,7 +121,17 @@
          >
            <Check /> æäº¤å‡ºåº“
          </el-button>
          <el-button type="text" size="small" @click="showDetailBox = false" class="cancel-btn" :disabled="loading">
          <el-button 
            type="text" 
            size="small" 
            @click="(e) => {
              e.stopPropagation();
              e.preventDefault();
              showDetailBox = false;
            }" 
            class="cancel-btn" 
            :disabled="loading"
          >
            å–消
          </el-button>
        </div>
@@ -116,9 +141,9 @@
</template>

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

import VolBox from "@/components/basic/VolBox.vue";
import http from '@/api/http';
@@ -134,6 +159,8 @@
});
const scannedBarcodes = ref([]);
const loading = ref(false);
// æ–°å¢žï¼šå­˜å‚¨é¦–次扫描的采购单号（用于一致性校验）
const firstPurchaseOrderNo = ref(null);

// æ¨¡æ¿å¼•ç”¨
const formRef = ref(null);
@@ -148,6 +175,25 @@
  });
});

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

// ç®€å•é˜²æŠ–函数（无需依赖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;
@@ -155,6 +201,8 @@
  formData.barcode = "";
  orderForm.outboundOrderNo = "";
  orderForm.purchaseOrderNo = "";
  // é‡ç½®é¦–次采购单号
  firstPurchaseOrderNo.value = null;
  nextTick(() => {
    outboundInputRef.value?.focus();
  });
@@ -162,43 +210,55 @@

// å‡ºåº“单输入处理（扫码或手动输入）
const handleOutboundInput = (value) => {
  // æ‰«ç æžªè¾“入通常会自动触发enter事件，这里主要处理手动输入的情况
  if (value && value.trim()) {
    // å¯ä»¥åœ¨è¿™é‡Œæ·»åŠ å‡ºåº“单号的格式验证逻辑
    // å‡ºåº“单号格式验证逻辑（按需保留）
  }
};

// é‡‡è´­å•è¾“入处理（扫码或手动输入）
const handlePurchaseInput = (value) => {
  if (value && value.trim()) {
    // å¯ä»¥åœ¨è¿™é‡Œæ·»åŠ é‡‡è´­å•å·çš„格式验证逻辑
    // é‡‡è´­å•å·æ ¼å¼éªŒè¯é€»è¾‘（按需保留）
  }
};

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

const focusBarcodeInput = () => {
  if (orderForm.purchaseOrderNo.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 = "";
@@ -208,33 +268,72 @@

  try {
    loading.value = true;
    // è¿™é‡Œä¿ç•™äº†åŽŸæœ‰çš„条码验证接口，你可以根据实际需求修改或保留
    const res = await http.post("/api/OutboundPicking/BarcodeValidate", {
      outOder: orderForm.outboundOrderNo, // æ³¨æ„ï¼šè¿™é‡ŒçŽ°åœ¨ä¼ é€’的是单据号字符串，而不是ID
      inOder: orderForm.purchaseOrderNo,  // æ³¨æ„ï¼šè¿™é‡ŒçŽ°åœ¨ä¼ é€’的是单据号字符串，而不是ID

    // æ­¥éª¤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 (res.status === true) {
    if (validateRes.status === true) {
      scannedBarcodes.value.push({ barcode });
      ElMessage.success("扫描成功");
      formData.barcode = "";
    } else {
      ElMessage.error("扫描失败：" + (res.message || '验证失败'));
      ElMessage.error("扫描失败：" + (validateRes.message || '条码验证失败'));
    }
  } catch (error) {
    ElMessage.error("扫描验证异常：" + error.message);
    // æ•èŽ·é‡‡è´­å•ä¸ä¸€è‡´ç­‰é”™è¯¯å¹¶æç¤º
    ElMessage.error(error.message);
    // æ¸…空当前输入框，聚焦条码输入框
    formData.barcode = "";
    nextTick(() => barcodeInputRef.value?.focus());
  } finally {
    loading.value = false;
    nextTick(() => barcodeInputRef.value?.focus());
    // å¼ºåˆ¶èšç„¦æ¡ç è¾“入框，避免焦点跳到弹窗外
    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,
@@ -244,6 +343,11 @@
    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 || '删除失败'));
    }
@@ -265,7 +369,6 @@

  try {
    loading.value = true;
    // è¿™é‡Œä¿ç•™äº†åŽŸæœ‰çš„提交接口，注意参数现在传递的是单据号字符串
    const res = await http.post("/api/OutboundPicking/NoStockOutSubmit", {
      OutOderSubmit: orderForm.outboundOrderNo,
      InOderSubmit: orderForm.purchaseOrderNo,
@@ -275,6 +378,9 @@
    if (res.status === true) {
      ElMessage.success("出库提交成功");
      showDetailBox.value = false;
      // æäº¤æˆåŠŸåŽé‡ç½®çŠ¶æ€
      firstPurchaseOrderNo.value = null;
      scannedBarcodes.value = [];
    } else {
      ElMessage.error("出库提交失败：" + (res.message || '提交失败'));
    }