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

pan

2025-11-30 dcdb87f1cb6cfd66d3fc01bc2248e4876c37f223

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

@@ -9,51 +9,29 @@
      class="custom-vol-box"
    >
      <div>
        <!-- å•æ®é€‰æ‹©åŒºåŸŸï¼ˆå¯è¾“入搜索） -->
        <!-- å•æ®è¾“入区域（支持扫码） -->
        <el-form :inline="true" :model="orderForm" style="margin-bottom: 20px; align-items: flex-end;">
          <el-form-item label="出库单据:" name="outboundOrderId">
            <el-select
              v-model="orderForm.outboundOrderId"
              placeholder="请选择或扫描出库单据号"
          <el-form-item label="出库单据:" name="outboundOrderNo">
            <el-input
              v-model="orderForm.outboundOrderNo"
              placeholder="请输入或扫描出库单据号"
              clearable
              style="width: 220px; margin-right: 10px;"
              @change="handleOrderChange"
              @visible-change="handleOutboundVisibleChange"
              :loading="loading"
              filterable
              :filter-method="filterOutboundOrders"
              @input="handleOutboundScanInput"  
              ref="outboundSelectRef"        
            >
              <el-option
                v-for="order in filteredOutboundOrders"
                :key="order.id"
                :label="order.orderNo"
                :value="order.id"
              ></el-option>
            </el-select>
              @input="handleOutboundInput"
              @keyup.enter="focusPurchaseInput"
              ref="outboundInputRef"
            ></el-input>
          </el-form-item>
          <el-form-item label="采购单据:" name="purchaseOrderId">
            <el-select
              v-model="orderForm.purchaseOrderId"
              placeholder="请选择或扫描采购单据号"
          <el-form-item label="采购单据:" name="purchaseOrderNo">
            <el-input
              v-model="orderForm.purchaseOrderNo"
              placeholder="请输入或扫描采购单据号"
              clearable
              style="width: 220px; margin-right: 10px;"
              @change="handleOrderChange"
              @visible-change="handlePurchaseVisibleChange"
              :loading="loading"
              filterable
              :filter-method="filterPurchaseOrders"
              @input="handlePurchaseScanInput" 
              ref="purchaseSelectRef"
            >
              <el-option
                v-for="order in filteredPurchaseOrders"
                :key="order.id"
                :label="order.orderNo"
                :value="order.id"
              ></el-option>
            </el-select>
              @input="handlePurchaseInput"
              @keyup.enter="focusBarcodeInput"
              ref="purchaseInputRef"
            ></el-input>
          </el-form-item>
        </el-form>

@@ -72,7 +50,7 @@
              @keyup.enter="handleScan"
              autofocus
              class="custom-input"
              :disabled="!orderForm.outboundOrderId || !orderForm.purchaseOrderId"
              :disabled="!orderForm.outboundOrderNo || !orderForm.purchaseOrderNo"
            ></el-input>
          </el-form-item>
          <el-form-item>
@@ -81,7 +59,7 @@
              size="small" 
              @click="handleScan" 
              class="custom-button"
              :disabled="!orderForm.outboundOrderId || !orderForm.purchaseOrderId || loading"
              :disabled="!orderForm.outboundOrderNo || !orderForm.purchaseOrderNo || loading"
            >
              <Search /> ç¡®è®¤æ‰«æ
            </el-button>
@@ -109,7 +87,7 @@
                  </div>
                </transition-group>
                <div class="empty-tip" v-if="scannedBarcodes.length === 0">
                  <span>暂无扫描记录，请先选择单据后扫描条码</span>
                  <span>暂无扫描记录，请先输入单据后扫描条码</span>
                </div>
              </el-scrollbar>
            </div>
@@ -123,7 +101,7 @@
            type="primary" 
            size="small" 
            @click="submit" 
            :disabled="scannedBarcodes.length === 0 || !orderForm.outboundOrderId || !orderForm.purchaseOrderId || loading" 
            :disabled="scannedBarcodes.length === 0 || !orderForm.outboundOrderNo || !orderForm.purchaseOrderNo || loading" 
            class="submit-btn"
          >
            <Check /> æäº¤å‡ºåº“
@@ -140,6 +118,7 @@
<script setup>
import { ref, reactive, onMounted, nextTick } from 'vue';
import { ElMessage } from 'element-plus';
import { Search } from '@element-plus/icons-vue';

import VolBox from "@/components/basic/VolBox.vue";
import http from '@/api/http';
@@ -147,32 +126,26 @@
// å“åº”式数据
const showDetailBox = ref(false);
const orderForm = reactive({
  outboundOrderId: "",
  purchaseOrderId: ""
  outboundOrderNo: "",
  purchaseOrderNo: ""
});
const formData = reactive({
  barcode: "",
});
const scannedBarcodes = ref([]);
const outboundOrders = ref([]);
const purchaseOrders = ref([]);
const filteredOutboundOrders = ref([]);
const filteredPurchaseOrders = ref([]);
const loading = ref(false);

// æ¨¡æ¿å¼•ç”¨
const formRef = ref(null);
const barcodeInputRef = ref(null);
const outboundSelectRef = ref(null); // æ–°å¢žï¼šå‡ºåº“单select的ref
const purchaseSelectRef = ref(null); // æ–°å¢žï¼šé‡‡è´­å•select的ref
const outboundInputRef = ref(null);
const purchaseInputRef = ref(null);

// ç”¨äºŽé˜²æ­¢è¾“入事件和change事件冲突的锁
const isProcessingScan = ref(false);

// ç»„件挂载时初始化过滤后的列表
// ç»„件挂载时聚焦到出库单输入框
onMounted(() => {
  filteredOutboundOrders.value = [...outboundOrders.value];
  filteredPurchaseOrders.value = [...purchaseOrders.value];
  nextTick(() => {
    outboundInputRef.value?.focus();
  });
});

// æ‰“开弹窗
@@ -180,169 +153,44 @@
  showDetailBox.value = true;
  scannedBarcodes.value = [];
  formData.barcode = "";
  orderForm.outboundOrderId = "";
  orderForm.purchaseOrderId = "";
  orderForm.outboundOrderNo = "";
  orderForm.purchaseOrderNo = "";
  nextTick(() => {
    outboundInputRef.value?.focus();
  });
};

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

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

// ç„¦ç‚¹è·³è½¬å‡½æ•°
const focusPurchaseInput = () => {
  if (orderForm.outboundOrderNo.trim()) {
    purchaseInputRef.value?.focus();
  } else {
    ElMessage.warning("请先输入有效的出库单据号");
  }
};

const focusBarcodeInput = () => {
  if (orderForm.purchaseOrderNo.trim()) {
    barcodeInputRef.value?.focus();
  });
};

// åŠ è½½å‡ºåº“单据列表
const loadOutboundOrders = async () => {
  if (outboundOrders.value.length > 0) return;
  try {
    loading.value = true;
    const res = await http.get("/api/OutboundPicking/GetAvailablePickingOrders");
    
    if (res.code === 0) {
      outboundOrders.value = res.data.map(orderNo => ({
        id: orderNo,
        orderNo: orderNo
      }));
      filteredOutboundOrders.value = [...outboundOrders.value];
    } else {
      ElMessage.error("加载出库单据失败：" + (res.message || '未知错误'));
    }
  } catch (error) {
    ElMessage.error("加载出库单据异常：" + error.message);
  } finally {
    loading.value = false;
    ElMessage.warning("请先输入有效的采购单据号");
  }
};

// åŠ è½½é‡‡è´­å•æ®åˆ—表
const loadPurchaseOrders = async () => {
  if (purchaseOrders.value.length > 0) return;
  try {
    loading.value = true;
    const res = await http.get("/api/OutboundPicking/GetAvailablePurchaseOrders");
    
    if (res.status === true) {
      purchaseOrders.value = res.data.map(orderNo => ({
        id: orderNo,
        orderNo: orderNo
      }));
      filteredPurchaseOrders.value = [...purchaseOrders.value];
    } else {
      ElMessage.error("加载采购单据失败：" + (res.message || '未知错误'));
    }
  } catch (error) {
    ElMessage.error("加载采购单据异常：" + error.message);
  } finally {
    loading.value = false;
  }
};

// å‡ºåº“单据过滤方法
const filterOutboundOrders = (value) => {
  if (!value) {
    filteredOutboundOrders.value = [...outboundOrders.value];
  } else {
    const lowerValue = value.toLowerCase();
    filteredOutboundOrders.value = outboundOrders.value.filter(order => 
      order.orderNo.toLowerCase().includes(lowerValue)
    );
  }
};

// é‡‡è´­å•æ®è¿‡æ»¤æ–¹æ³•
const filterPurchaseOrders = (value) => {
  if (!value) {
    filteredPurchaseOrders.value = [...purchaseOrders.value];
  } else {
    const lowerValue = value.toLowerCase();
    filteredPurchaseOrders.value = purchaseOrders.value.filter(order => 
      order.orderNo.toLowerCase().includes(lowerValue)
    );
  }
};

// å‡ºåº“单据下拉框显示/隐藏时触发
const handleOutboundVisibleChange = (visible) => {
  if (visible) {
    loadOutboundOrders();
  } else {
    // å½“下拉框关闭时，如果是扫描操作导致的，清空输入框
    if (isProcessingScan.value) {
        nextTick(() => {
            outboundSelectRef.value?.clearInput();
            isProcessingScan.value = false;
        });
    }
  }
};

// é‡‡è´­å•æ®ä¸‹æ‹‰æ¡†æ˜¾ç¤º/隐藏时触发
const handlePurchaseVisibleChange = (visible) => {
  if (visible) {
    loadPurchaseOrders();
  } else {
    // å½“下拉框关闭时，如果是扫描操作导致的，清空输入框
    if (isProcessingScan.value) {
        nextTick(() => {
            purchaseSelectRef.value?.clearInput();
            isProcessingScan.value = false;
        });
    }
  }
};

// å•æ®é€‰æ‹©å˜åŒ–时触发
const handleOrderChange = () => {
  // å¦‚果是手动选择，则不清空输入框
  isProcessingScan.value = false;
  
  scannedBarcodes.value = [];
  nextTick(() => {
    barcodeInputRef.value?.focus();
  });
};

/**
 * å¤„理出库单扫描输入
 * @param {string} scanText - æ‰«ææžªè¾“入的文本
 */
const handleOutboundScanInput = async (scanText) => {
  // é¿å…å¤„理空字符串或由change事件触发的内部操作
  if (!scanText || isProcessingScan.value) return;

  // æŸ¥æ‰¾å®Œå…¨åŒ¹é…çš„订单
  const matchedOrder = outboundOrders.value.find(order => order.orderNo === scanText);

  if (matchedOrder) {
    isProcessingScan.value = true; // æ ‡è®°ä¸ºæ­£åœ¨å¤„理扫描
    // æ‰‹åŠ¨èµ‹å€¼
    orderForm.outboundOrderId = matchedOrder.id;
    ElMessage.success(`成功选择出库单：${matchedOrder.orderNo}`);
    
    // å»¶è¿Ÿèšç„¦åˆ°ä¸‹ä¸€ä¸ªè¾“入框，确保赋值完成
    setTimeout(() => {
        purchaseSelectRef.value?.focus();
    }, 100);
  }
  // å¦‚果没有匹配项，不做任何事，让el-select保持过滤状态，用户可以手动选择
};

/**
 * å¤„理采购单扫描输入
 * @param {string} scanText - æ‰«ææžªè¾“入的文本
 */
const handlePurchaseScanInput = async (scanText) => {
  if (!scanText || isProcessingScan.value) return;

  const matchedOrder = purchaseOrders.value.find(order => order.orderNo === scanText);

  if (matchedOrder) {
    isProcessingScan.value = true; // æ ‡è®°ä¸ºæ­£åœ¨å¤„理扫描
    orderForm.purchaseOrderId = matchedOrder.id;
    ElMessage.success(`成功选择采购单：${matchedOrder.orderNo}`);
    
    setTimeout(() => {
        barcodeInputRef.value?.focus();
    }, 100);
  }
};


// æ‰«ææ¡ç å¤„理
const handleScan = async () => {
@@ -360,9 +208,10 @@

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

@@ -385,9 +234,10 @@
const removeItem = async (index, barcode) => {
  try {
    loading.value = true;
    // è¿™é‡Œä¿ç•™äº†åŽŸæœ‰çš„删除条码接口，你可以根据实际需求修改或保留
    const res = await http.post("/api/OutboundPicking/DeleteBarcode", {
      outOder: orderForm.outboundOrderId,
      inOder: orderForm.purchaseOrderId,
      outOder: orderForm.outboundOrderNo,
      inOder: orderForm.purchaseOrderNo,
      barCode: barcode
    });

@@ -415,9 +265,10 @@

  try {
    loading.value = true;
    // è¿™é‡Œä¿ç•™äº†åŽŸæœ‰çš„提交接口，注意参数现在传递的是单据号字符串
    const res = await http.post("/api/OutboundPicking/NoStockOutSubmit", {
      OutOderSubmit: orderForm.outboundOrderId,
      InOderSubmit: orderForm.purchaseOrderId,
      OutOderSubmit: orderForm.outboundOrderNo,
      InOderSubmit: orderForm.purchaseOrderNo,
      BarCodeSubmit: barcodes
    });