From 25750ab29ce4e243f4e4e17a796167f3a0f0697b Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 05 5月 2025 16:33:49 +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 | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 14fba7a..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"
@@ -2,7 +2,7 @@
* 鐗╂枡鍩虹淇℃伅鏌ヨ寮瑰嚭妗�
*/
import { SetupContext, defineComponent } from 'vue'
-import BaseDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
+import BaseQueryDrawer from '@/components/BaseQueryDrawer/BaseQueryDrawer'
import styles from './WmsMaterialQueryDrawer.module.scss'
import { useWmsMaterialQueryDrawer } from '../../../../Controllers/WmsMaterialQueryDrawer.tsx'
import DyForm from '@/components/DyForm/DyForm'
@@ -13,6 +13,11 @@
}>({
name: '寮圭獥',
props: {
+ //鏋氫妇绫诲瀷瀛楀吀
+ enumListDict:{
+ type: Array as () => Array<{ key: string; value: object }>, // 瀹氫箟鏁扮粍鍏冪礌绫诲瀷
+ default: () => [] // 榛樿鍊�
+ },
modelValue: {
type: Boolean,
default: false,
@@ -29,25 +34,27 @@
default: 0,
},
},
- emits: ['update:modelValue', 'close', 'submit', 'confirm'],
+ emits: ['update:modelValue', 'close', 'submit', 'confirmquery1'],
setup(props: Record<string, any>, ctx: SetupContext) {
const {
onClose,
- onConfirm,
+ onConfirmQuery,
onOpen,
+ onReset,
formRef,
visible,
formItems,
formData,
} = useWmsMaterialQueryDrawer(props, ctx)
return () => (
- <BaseDrawer
+ <BaseQueryDrawer
class={styles.drawer}
size="800px"
title={props.title || '楂樼骇鏌ヨ'}
v-model={visible.value}
close-on-click-modal={true}
- onConfirm={onConfirm}
+ onReset={onReset}
+ onConfirmQueryForBase={onConfirmQuery}
onOpen={onOpen}
before-close={onClose}
onClose={onClose}
@@ -58,7 +65,7 @@
labelWidth="106px"
formItemProps={formItems}
></DyForm>
- </BaseDrawer>
+ </BaseQueryDrawer>
)
},
})
--
Gitblit v1.9.3