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/mes/md/vendor/components/select.vue | 41 +++++++++--------------------------------
1 files changed, 9 insertions(+), 32 deletions(-)
diff --git a/src/views/mes/md/vendor/components/select.vue b/src/views/mes/md/vendor/components/select.vue
index dab6fba..f1c0974 100644
--- a/src/views/mes/md/vendor/components/select.vue
+++ b/src/views/mes/md/vendor/components/select.vue
@@ -1,13 +1,11 @@
<script lang="ts" setup>
import type { MesMdVendorApi } from '#/api/mes/md/vendor';
-import { computed, ref, useAttrs, watch } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
-import { IconifyIcon } from '..\..\..\..\..\packages\icons\src';
+import { IconifyIcon } from '@vben/icons';
import { Input, Tooltip } from 'ant-design-vue';
-
-import { getVendor } from '#/api/mes/md/vendor';
import MdVendorSelectDialog from './select-dialog.vue';
@@ -19,24 +17,26 @@
disabled?: boolean;
modelValue?: number;
placeholder?: string;
+ vendorName?: string;
}>(),
{
allowClear: true,
disabled: false,
modelValue: undefined,
placeholder: '璇烽�夋嫨渚涘簲鍟�',
+ vendorName: undefined,
},
);
const emit = defineEmits<{
change: [item: MesMdVendorApi.Vendor | undefined];
'update:modelValue': [value: number | undefined];
}>();
-const attrs = useAttrs(); // 閫忎紶灞炴��
-const dialogRef = ref<InstanceType<typeof MdVendorSelectDialog>>(); // 渚涘簲鍟嗛�夋嫨寮圭獥
-const hovering = ref(false); // 鏄惁鎮仠
-const selectedItem = ref<MesMdVendorApi.Vendor>(); // 褰撳墠閫変腑渚涘簲鍟�
+const attrs = useAttrs();
+const dialogRef = ref<InstanceType<typeof MdVendorSelectDialog>>();
+const hovering = ref(false);
+const selectedItem = ref<MesMdVendorApi.Vendor>();
-const displayLabel = computed(() => selectedItem.value?.name ?? ''); // 閫夋嫨鍣ㄥ睍绀哄悕绉�
+const displayLabel = computed(() => props.vendorName || selectedItem.value?.name || '');
const showClear = computed(
() =>
props.allowClear &&
@@ -45,34 +45,12 @@
props.modelValue !== null,
);
-/** 鏍规嵁渚涘簲鍟嗙紪鍙峰洖鏄鹃�夋嫨鍣� */
-async function resolveItemById(id: number | undefined) {
- if (!id) {
- selectedItem.value = undefined;
- return;
- }
- if (selectedItem.value?.id === id) {
- return;
- }
- selectedItem.value = await getVendor(id);
-}
-
-watch(
- () => props.modelValue,
- (value) => {
- resolveItemById(value);
- },
- { immediate: true },
-);
-
-/** 娓呯┖宸查�変緵搴斿晢 */
function clearSelected() {
selectedItem.value = undefined;
emit('update:modelValue', undefined);
emit('change', undefined);
}
-/** 鎵撳紑渚涘簲鍟嗛�夋嫨寮圭獥 */
function handleClick(event: MouseEvent) {
if (props.disabled) {
return;
@@ -89,7 +67,6 @@
dialogRef.value?.open(selectedIds, { multiple: false });
}
-/** 鍥炲～閫変腑鐨勪緵搴斿晢 */
function handleSelected(rows: MesMdVendorApi.Vendor[]) {
const item = rows[0];
if (!item) {
--
Gitblit v1.9.3