From cb9cd49627b65a4c0e137e08063271a8cefe1826 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 23 七月 2026 17:48:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_pro2.0' into dev_pro2.0
---
src/views/wls/warehouse/components/select.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/views/wls/warehouse/components/select.vue b/src/views/wls/warehouse/components/select.vue
index 339f6b8..4a4ff78 100644
--- a/src/views/wls/warehouse/components/select.vue
+++ b/src/views/wls/warehouse/components/select.vue
@@ -3,7 +3,7 @@
import { computed, onMounted, ref, useAttrs, watch } from 'vue';
-import { Select, SelectOption, Tag, Tooltip } from 'ant-design-vue';
+import { Select, SelectOption, Tooltip } from 'ant-design-vue';
import { getWarehouseSimpleList } from '#/api/mes/wm/warehouse';
@@ -13,12 +13,14 @@
defineProps<{
allowClear?: boolean;
disabled?: boolean;
+ excludeCodes?: string[];
modelValue?: number;
placeholder?: string;
}>(),
{
allowClear: true,
disabled: false,
+ excludeCodes: undefined,
modelValue: undefined,
placeholder: '璇烽�夋嫨浠撳簱',
},
@@ -32,6 +34,14 @@
const attrs = useAttrs();
const allList = ref<MesWmWarehouseApi.Warehouse[]>([]);
const selectedItem = ref<MesWmWarehouseApi.Warehouse>();
+
+/** 鎸� excludeCodes 杩囨护鍚庣殑浠撳簱鍒楄〃 */
+const filteredList = computed(() => {
+ if (!props.excludeCodes?.length) {
+ return allList.value;
+ }
+ return allList.value.filter((w) => !props.excludeCodes!.includes(w.code ?? ''));
+});
const selectValue = computed({
get: () => props.modelValue,
@@ -96,14 +106,12 @@
:disabled="disabled"
:filter-option="filterOption"
:placeholder="placeholder"
+ :popup-match-select-width="false"
show-search
@change="handleChange"
>
- <SelectOption v-for="item in allList" :key="item.id" :value="item.id">
- <div class="flex items-center gap-2">
- <span>{{ item.name }}</span>
- <Tag v-if="item.code" color="blue">缂栧彿: {{ item.code }}</Tag>
- </div>
+ <SelectOption v-for="item in filteredList" :key="item.id" :value="item.id">
+ {{ item.name }}
</SelectOption>
</Select>
</Tooltip>
--
Gitblit v1.9.3