From 5334be033295f330b25dd4d77a39a1dbd82cf79c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周六, 03 5月 2025 11:10:25 +0800
Subject: [PATCH] 22
---
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/components/BaseQueryDrawer/BaseQueryDrawer.tsx | 4 ++--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Controllers/WmsMaterialQueryDrawer.tsx | 8 ++++++--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/Dialog/WmsMaterialQueryDrawer/WmsMaterialQueryDrawer.tsx | 4 ++--
Weben_CMS专用代码生成器/Weben_CMS_TemplateDemo/web/src/widgets/HIAWms/Views/Pages/WmsMaterial/WmsMaterial.tsx | 27 ++++++++++++++++++++++-----
4 files changed, 32 insertions(+), 11 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/components/BaseQueryDrawer/BaseQueryDrawer.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/components/BaseQueryDrawer/BaseQueryDrawer.tsx"
index 83ace70..1594dae 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/components/BaseQueryDrawer/BaseQueryDrawer.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/components/BaseQueryDrawer/BaseQueryDrawer.tsx"
@@ -26,7 +26,7 @@
// default: false,
// },
},
- emits: ['close', 'confirmQuery', 'update:modelValue', 'open', 'beforeClose'],
+ emits: ['close', 'confirmQueryForBase', 'update:modelValue', 'open', 'beforeClose'],
setup(props: any, { emit, slots, attrs }: any) {
// const size = computed(() => {
// if (attrs.size.includes('px')) {
@@ -71,7 +71,7 @@
鍏抽棴
</el-button>
<el-button
- onClick={() => emit('confirmQuery')}
+ onClick={() => emit('confirmQueryForBase')}
type="primary"
class={{
[styles.csBaseBtn]: true,
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/Controllers/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/Controllers/WmsMaterialQueryDrawer.tsx"
index a8b09be..6248a7e 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/Controllers/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/Controllers/WmsMaterialQueryDrawer.tsx"
@@ -205,8 +205,9 @@
* 纭鏌ヨ
*/
const onConfirmQuery = async () => {
- ElMessage.success('鐐瑰嚮浜嗘煡璇㈡寜閽�')
- await formRef.value?.validate()
+ alert('浣犳潵鍚婃垜鍐呴儴鏂规硶浜嗗晩');
+
+ //await formRef.value?.validate()
const data = {
materialCode: formData.value.materialCode,
materialName: formData.value.materialName,
@@ -232,6 +233,9 @@
ElMessage.success('淇濆瓨鎴愬姛')
//ctx.emit('confirmQuery')
//澧炲姞浼犻�掑弬鏁� 銆怑ditby shaocx,2025-05-03銆�
+ debugger
+ console.log("鏂颁紶閫掑弬鏁版槸:"+data);
+ alert("鏂颁紶閫掑弬鏁版槸:"+data);
ctx.emit('confirmQuery',data)
}
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 55b6068..921bb25 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"
@@ -29,7 +29,7 @@
default: 0,
},
},
- emits: ['update:modelValue', 'close', 'submit', 'confirmquery'],
+ emits: ['update:modelValue', 'close', 'submit', 'confirmquery1'],
setup(props: Record<string, any>, ctx: SetupContext) {
const {
onClose,
@@ -47,7 +47,7 @@
title={props.title || '楂樼骇鏌ヨ'}
v-model={visible.value}
close-on-click-modal={true}
- confirmQuery={onConfirmQuery}
+ onConfirmQueryForBase={onConfirmQuery}
onOpen={onOpen}
before-close={onClose}
onClose={onClose}
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/WmsMaterial/WmsMaterial.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/WmsMaterial/WmsMaterial.tsx"
index 899b9e7..b879231 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/WmsMaterial/WmsMaterial.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/WmsMaterial/WmsMaterial.tsx"
@@ -116,10 +116,24 @@
})
// 鏂板鐨勬煡璇㈡柟娉�
- const handleQuery = async () => {
- console.log('鏌ヨ鏉′欢:', queryParams.value)
- // tableRef.value.getTableList()
- tableRef.value.getList(queryParams.value)
+ const handleQuery = async (extraParams = {}) => {
+ //console.log('鏂扮殑鏌ヨ鏉′欢:', extraParams)
+ //debugger
+ alert('璋冪敤handleQuery鏂规硶');
+ console.log('鏂扮殑鏌ヨ鏉′欢:', extraParams)
+ // 杩囨护鎺� undefined 鐨勫��
+const filteredData = Object.assign(
+ {},
+ ...Object.entries(extraParams).map(([key, value]) => (value !== undefined ? { [key]: value } : {}))
+);
+
+ tableRef.value.getList(filteredData)
+ // debugger
+ // console.log('鏂扮殑鏌ヨ鏉′欢:', extraParams)
+ // tableRef.value.getList(extraParams)
+ // console.log('鏌ヨ鏉′欢:', queryParams.value)
+ // // tableRef.value.getTableList()
+ // tableRef.value.getList(queryParams.value)
}
// 閲嶇疆鏌ヨ鏉′欢
@@ -207,7 +221,7 @@
title={dialogConfigForQuery.title}
row={current.value}
sort={sort.value}
- onConfirmQuery={onConfirmWmsMaterial}
+ onConfirmQuery={handleQuery}
/>
{/* 鏂板鐨勬煡璇㈣〃鍗� */}
@@ -347,6 +361,9 @@
onConfirm={onSearch}
style={{ marginTop: '-1px' }}
/>
+ <IconButton type="primary" icon="search" onClick={handleQuery}>
+ 鏌ヨ
+ </IconButton>
<IconButton
style=""
icon="refresh"
--
Gitblit v1.9.3