From a17257382b733190906c8d485e9f6d176ffd60a3 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 14 八月 2026 11:48:31 +0800
Subject: [PATCH] Merge branch 'dev_pro2.0' of http://114.132.189.42:9002/r/mom-pro2-before into dev_pro2.0
---
src/views/mes/md/item/components/select-dialog.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/src/views/mes/md/item/components/select-dialog.vue b/src/views/mes/md/item/components/select-dialog.vue
index 30622bf..d377f66 100644
--- a/src/views/mes/md/item/components/select-dialog.vue
+++ b/src/views/mes/md/item/components/select-dialog.vue
@@ -5,7 +5,7 @@
import { nextTick, ref } from "vue";
- import { CommonStatusEnum } from "../../../../../packages/constants/src";
+ import { CommonStatusEnum } from "@vben/constants";
import { Card, message, Modal } from "ant-design-vue";
@@ -26,6 +26,7 @@
const selectedRows = ref<MesMdItemApi.Item[]>([]); // 宸查�夌墿鏂欏垪琛�
const selectedItemTypeId = ref<number>(); // 褰撳墠绛涢�夊垎绫荤紪鍙�
const preSelectedIds = ref<number[]>([]); // 棰勯�夌墿鏂欑紪鍙峰垪琛�
+ const productIds = ref<number[]>([]); // 闄愬畾鍙�夌殑鐗╂枡缂栧彿鍒楄〃锛堜负绌哄垯涓嶉檺鍒讹級
const typeTreeRef = ref<InstanceType<typeof MdItemTypeTree>>(); // 鐗╂枡鍒嗙被鏍�
/** 鑾峰彇褰撳墠琛ㄦ牸鏁版嵁 */
@@ -130,13 +131,20 @@
proxyConfig: {
ajax: {
query: async ({ page }, formValues) => {
- return await getItemPage({
+ const params: Record<string, unknown> = {
pageNo: page.currentPage,
pageSize: page.pageSize,
...formValues,
itemTypeId: selectedItemTypeId.value,
status: CommonStatusEnum.ENABLE,
- });
+ };
+ // 闄愬畾鍙�夌墿鏂欒寖鍥�
+ if (productIds.value.length > 0) {
+ params.pageSize = 1000;
+ params.ids = productIds.value.join(',');
+ }
+ const result = await getItemPage(params as never);
+ return result;
},
},
},
@@ -173,11 +181,12 @@
/** 鎵撳紑鐗╂枡閫夋嫨寮圭獥 */
async function openModal(
selectedIds?: number[],
- options?: { multiple?: boolean }
+ options?: { multiple?: boolean; productIds?: number[] }
) {
open.value = true;
multiple.value = options?.multiple ?? true;
preSelectedIds.value = selectedIds || [];
+ productIds.value = options?.productIds || [];
await nextTick();
gridApi.setGridOptions({
columns: useItemSelectGridColumns(multiple.value),
--
Gitblit v1.9.3