From b75b10418fbc2df069aeb7a4b15e6e65690d133a Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 06 5月 2025 13:33:59 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx" "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx"
index 88f70eb..1b080df 100644
--- "a/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx"
+++ "b/Weben_CMS\344\270\223\347\224\250\344\273\243\347\240\201\347\224\237\346\210\220\345\231\250/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx"
@@ -13,6 +13,11 @@
}>({
name: '寮圭獥',
props: {
+ //鏋氫妇绫诲瀷瀛楀吀
+ enumListDict:{
+ type: Array as () => Array<{ key: string; value: object }>, // 瀹氫箟鏁扮粍鍏冪礌绫诲瀷
+ default: () => [] // 榛樿鍊�
+ },
modelValue: {
type: Boolean,
default: false,
@@ -29,12 +34,13 @@
default: 0,
},
},
- emits: ['update:modelValue', 'close', 'submit', 'confirm'],
+ emits: ['update:modelValue', 'close', 'submit', 'confirmquery1'],
setup(props: Record<string, any>, ctx: SetupContext) {
const {
onClose,
onConfirmQuery,
onOpen,
+ onReset,
formRef,
visible,
formItems,
@@ -47,7 +53,8 @@
title={props.title || '楂樼骇鏌ヨ'}
v-model={visible.value}
close-on-click-modal={true}
- confirmQuery={onConfirmQuery}
+ onReset={onReset}
+ onConfirmQueryForBase={onConfirmQuery}
onOpen={onOpen}
before-close={onClose}
onClose={onClose}
--
Gitblit v1.9.3